Skip to content

Commit 49ec90a

Browse files
committed
Fix all flake 8 errors and warnings (except excluded and ignored files)
Signed-off-by: Christopher Arndt <[email protected]>
1 parent 785a368 commit 49ec90a

24 files changed

+669
-690
lines changed

examples/basic/contextmanager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import time
88
import rtmidi
99

10-
from rtmidi.midiconstants import *
10+
from rtmidi.midiconstants import NOTE_OFF, NOTE_ON
1111

12-
NOTE = 60 # middle C
12+
NOTE = 60 # middle C
1313

1414
midiout = rtmidi.MidiOut()
1515

examples/basic/midiin_callback.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
import sys
99
import time
1010

11-
import rtmidi
1211
from rtmidi.midiutil import open_midiport
1312

1413
log = logging.getLogger('test_midiin_callback')
15-
1614
logging.basicConfig(level=logging.DEBUG)
1715

16+
1817
class MidiInputHandler(object):
1918
def __init__(self, port):
2019
self.port = port

examples/basic/midiin_poll.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import sys
99
import time
1010

11-
import rtmidi
1211
from rtmidi.midiutil import open_midiport
1312

1413
log = logging.getLogger('test_midiin_poll')

examples/basic/midiout.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@
88
import sys
99
import time
1010

11-
import rtmidi
1211
from rtmidi.midiutil import open_midiport
13-
from rtmidi.midiconstants import *
12+
from rtmidi.midiconstants import NOTE_OFF, NOTE_ON
1413

1514
log = logging.getLogger('test_midiout')
16-
1715
logging.basicConfig(level=logging.DEBUG)
1816

1917
port = sys.argv[1] if len(sys.argv) > 1 else None
@@ -23,7 +21,7 @@
2321
except (EOFError, KeyboardInterrupt):
2422
sys.exit()
2523

26-
note_on = [NOTE_ON, 60, 112] # channel 1, middle C, velocity 112
24+
note_on = [NOTE_ON, 60, 112] # channel 1, middle C, velocity 112
2725
note_off = [NOTE_OFF, 60, 0]
2826

2927
print("Sending NoteOn event.")

examples/basic/probe_ports.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55
"""Shows how to probe for available MIDI input and output ports."""
66

7-
import sys
8-
9-
from rtmidi import *
7+
from rtmidi import (API_LINUX_ALSA, API_MACOSX_CORE, API_RTMIDI_DUMMY,
8+
API_UNIX_JACK, API_WINDOWS_MM, MidiIn, MidiOut,
9+
get_compiled_api)
1010

1111
try:
1212
input = raw_input
@@ -15,10 +15,10 @@
1515
StandardError = Exception
1616

1717
apis = {
18-
API_MACOSX_CORE: "OS X CoreMIDI",
19-
API_LINUX_ALSA: "Linux ALSA",
20-
API_UNIX_JACK: "Jack Client",
21-
API_WINDOWS_MM: "Windows MultiMedia",
18+
API_MACOSX_CORE: "OS X CoreMIDI",
19+
API_LINUX_ALSA: "Linux ALSA",
20+
API_UNIX_JACK: "Jack Client",
21+
API_WINDOWS_MM: "Windows MultiMedia",
2222
API_RTMIDI_DUMMY: "RtMidi Dummy"
2323
}
2424

@@ -27,8 +27,8 @@
2727
for api, api_name in sorted(apis.items()):
2828
if api in available_apis:
2929
try:
30-
if input("Probe ports using the %s API? (Y/n) " % api_name
31-
).strip().lower() not in ['', 'y', 'yes']:
30+
reply = input("Probe ports using the %s API? (Y/n) " % api_name)
31+
if reply.strip().lower() not in ['', 'y', 'yes']:
3232
continue
3333
except (KeyboardInterrupt, EOFError):
3434
print('')

examples/drumseq/drumseq.py

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717
from time import sleep, time as timenow
1818

1919
import rtmidi
20-
from rtmidi.midiutil import open_midiport
21-
from rtmidi.midiconstants import *
20+
from rtmidi.midiutil import open_midioutput
21+
from rtmidi.midiconstants import (ALL_SOUND_OFF, BANK_SELECT_LSB,
22+
BANK_SELECT_MSB, CHANNEL_VOLUME,
23+
CONTROL_CHANGE, NOTE_ON, PROGRAM_CHANGE)
2224

2325

2426
FUNKYDRUMMER = """
@@ -98,13 +100,13 @@ class Drumpattern(object):
98100
"""Container and iterator for a multi-track step sequence."""
99101

100102
velocities = {
101-
"-": None, # continue note
102-
".": 0, # off
103-
"+": 10, # ghost
104-
"s": 60, # soft
105-
"m": 100, # medium
106-
"x": 120, # hard
107-
}
103+
"-": None, # continue note
104+
".": 0, # off
105+
"+": 10, # ghost
106+
"s": 60, # soft
107+
"m": 100, # medium
108+
"x": 120, # hard
109+
}
108110

109111
def __init__(self, pattern, kit=0, humanize=0):
110112
self.instruments = []
@@ -141,6 +143,7 @@ def playstep(self, midiout, channel=9):
141143
if velocity > 0:
142144
if self.humanize:
143145
velocity += int(round(gauss(0, velocity * self.humanize)))
146+
144147
midiout.send_message([NOTE_ON | channel, note, max(1, velocity)])
145148
self._notes[note] = velocity
146149

@@ -152,22 +155,23 @@ def playstep(self, midiout, channel=9):
152155

153156
def main(args=None):
154157
ap = argparse.ArgumentParser(description=__doc__.splitlines()[0])
155-
ap.add_argument('-b', '--bpm', type=float, default=100,
156-
help="Beats per minute (BPM) (default: %(default)s)")
157-
ap.add_argument('-c', '--channel', type=int, default=10, metavar='CH',
158-
help="MIDI channel (default: %(default)s)")
159-
ap.add_argument('-p', '--port',
160-
help="MIDI output port number (default: ask)")
161-
ap.add_argument('-k', '--kit', type=int, metavar='KIT',
162-
help="Drum kit MIDI program number (default: none)")
163-
ap.add_argument('--bank-msb', type=int, metavar='MSB',
164-
help="MIDI bank select MSB (CC#00) number (default: none)")
165-
ap.add_argument('--bank-lsb', type=int, metavar='MSB',
166-
help="MIDI bank select LSB (CC#32) number (default: none)")
167-
ap.add_argument('-H', '--humanize', type=float, default=0.0, metavar='VAL',
168-
help="Random velocity variation (float, default: 0, try ~0.03)")
169-
ap.add_argument('pattern', nargs='?', type=argparse.FileType(),
170-
help="Drum pattern file (default: use built-in pattern)")
158+
aadd = ap.add_argument
159+
aadd('-b', '--bpm', type=float, default=100,
160+
help="Beats per minute (BPM) (default: %(default)s)")
161+
aadd('-c', '--channel', type=int, default=10, metavar='CH',
162+
help="MIDI channel (default: %(default)s)")
163+
aadd('-p', '--port',
164+
help="MIDI output port number (default: ask)")
165+
aadd('-k', '--kit', type=int, metavar='KIT',
166+
help="Drum kit MIDI program number (default: none)")
167+
aadd('--bank-msb', type=int, metavar='MSB',
168+
help="MIDI bank select MSB (CC#00) number (default: none)")
169+
aadd('--bank-lsb', type=int, metavar='MSB',
170+
help="MIDI bank select LSB (CC#32) number (default: none)")
171+
aadd('-H', '--humanize', type=float, default=0.0, metavar='VAL',
172+
help="Random velocity variation (float, default: 0, try ~0.03)")
173+
aadd('pattern', nargs='?', type=argparse.FileType(),
174+
help="Drum pattern file (default: use built-in pattern)")
171175

172176
args = ap.parse_args(args if args is not None else sys.argv[1:])
173177

@@ -180,9 +184,11 @@ def main(args=None):
180184
pattern = Drumpattern(pattern, kit=kit, humanize=args.humanize)
181185

182186
try:
183-
midiout, port_name = open_midiport(args.port, "output",
187+
midiout, port_name = open_midioutput(
188+
args.port,
184189
api=rtmidi.API_UNIX_JACK,
185-
client_name="drumseq", port_name="MIDI Out")
190+
client_name="drumseq",
191+
port_name="MIDI Out")
186192
except (EOFError, KeyboardInterrupt):
187193
return
188194

@@ -196,7 +202,7 @@ def main(args=None):
196202
except KeyboardInterrupt:
197203
print('')
198204
finally:
199-
seq.done = True # And kill it.
205+
seq.done = True # And kill it.
200206
seq.join()
201207
del midiout
202208
print("Done")

examples/midi2command/midi2command.py

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
import yaml
4141

4242
import rtmidi
43-
from rtmidi.midiutil import open_midiport
44-
from rtmidi.midiconstants import *
43+
from rtmidi.midiutil import open_midiinput
44+
from rtmidi.midiconstants import (CHANNEL_PRESSURE, CONTROLLER_CHANGE, NOTE_ON, NOTE_OFF,
45+
PITCH_BEND, POLY_PRESSURE, PROGRAM_CHANGE)
4546

4647

4748
log = logging.getLogger('midi2command')
@@ -63,8 +64,8 @@
6364

6465

6566
class Command(object):
66-
def __init__(self, name='', description='', status=0xB0, channel=None,
67-
data=None, command=None):
67+
def __init__(self, name='', description='', status=0xB0, channel=None, data=None,
68+
command=None):
6869
self.name = name
6970
self.description = description
7071
self.status = status
@@ -106,7 +107,7 @@ def __call__(self, event, data=None):
106107
data2 = event[2]
107108

108109
log.debug("[%s] @%i CH:%2s %02X %s %s", self.port, self._wallclock,
109-
channel or '-', status, data1, data2 or '')
110+
channel or '-', status, data1, data2 or '')
110111

111112
# Look for matching command definitions
112113
cmd = self.lookup_command(status, channel, data1, data2)
@@ -165,7 +166,7 @@ def load_config(self, filename):
165166
int(cmd.status)
166167
except:
167168
log.error("Unknown status '%s'. Ignoring command",
168-
cmd.status)
169+
cmd.status)
169170

170171
log.debug("Config: %s\n%s\n", cmd.name, cmd.description)
171172
self.commands.setdefault(status, []).append(cmd)
@@ -180,25 +181,28 @@ def main(args=None):
180181
181182
"""
182183
parser = argparse.ArgumentParser(description=__doc__.splitlines()[0])
183-
parser.add_argument('-b', '--backend',
184-
choices=sorted(BACKEND_MAP),
185-
help='MIDI backend API (default: OS dependant)')
186-
parser.add_argument('-p', '--port',
187-
help='MIDI input port name or number (default: open virtual input)')
188-
parser.add_argument('-v', '--verbose',
189-
action="store_true", help='verbose output')
190-
parser.add_argument(dest='config', metavar="CONFIG",
191-
help='Configuration file in YAML syntax.')
184+
padd = parser.add_argument
185+
padd('-b', '--backend', choices=sorted(BACKEND_MAP),
186+
help='MIDI backend API (default: OS dependant)')
187+
padd('-p', '--port',
188+
help='MIDI input port name or number (default: open virtual input)')
189+
padd('-v', '--verbose',
190+
action="store_true", help='verbose output')
191+
padd(dest='config', metavar="CONFIG",
192+
help='Configuration file in YAML syntax.')
192193

193194
args = parser.parse_args(args if args is not None else sys.argv[1:])
194195

195196
logging.basicConfig(format="%(name)s: %(levelname)s - %(message)s",
196-
level=logging.DEBUG if args.verbose else logging.WARNING)
197+
level=logging.DEBUG if args.verbose else logging.INFO)
197198

198199
try:
199-
midiin, port_name = open_midiport(args.port, use_virtual=True,
200+
midiin, port_name = open_midiinput(
201+
args.port,
202+
use_virtual=True,
200203
api=BACKEND_MAP.get(args.backend, rtmidi.API_UNSPECIFIED),
201-
client_name='midi2command', port_name='MIDI input')
204+
client_name='midi2command',
205+
port_name='MIDI input')
202206
except (IOError, ValueError) as exc:
203207
return "Could not open MIDI input: %s" % exc
204208
except (EOFError, KeyboardInterrupt):

examples/midifilter/__main__.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
except ImportError: # Python 3
1919
import queue
2020

21-
import rtmidi
2221
from rtmidi.midiutil import open_midiport
2322

24-
from .filters import *
23+
from .filters import MapControllerValue, MonoPressureToCC, Transpose
2524

2625

2726
log = logging.getLogger("midifilter")
@@ -67,25 +66,26 @@ def stop(self):
6766

6867
def main(args=None):
6968
parser = argparse.ArgumentParser(prog='midifilter', description=__doc__)
70-
parser.add_argument('-m', '--mpresstocc', action="store_true",
71-
help='Map mono pressure (channel aftertouch) to CC')
72-
parser.add_argument('-r', '--mapccrange', action="store_true",
73-
help='Map controller value range to min/max value range')
74-
parser.add_argument('-t', '--transpose', action="store_true",
75-
help='Transpose note on/off event note values')
76-
parser.add_argument('-i', '--inport',
77-
help='MIDI input port number (default: ask)')
78-
parser.add_argument('-o', '--outport',
79-
help='MIDI output port number (default: ask)')
80-
parser.add_argument('-v', '--verbose', action="store_true",
81-
help='verbose output')
82-
parser.add_argument('filterargs', nargs="*", type=int,
83-
help='MIDI filter argument(s)')
69+
padd = parser.add_argument
70+
padd('-m', '--mpresstocc', action="store_true",
71+
help='Map mono pressure (channel aftertouch) to CC')
72+
padd('-r', '--mapccrange', action="store_true",
73+
help='Map controller value range to min/max value range')
74+
padd('-t', '--transpose', action="store_true",
75+
help='Transpose note on/off event note values')
76+
padd('-i', '--inport',
77+
help='MIDI input port number (default: ask)')
78+
padd('-o', '--outport',
79+
help='MIDI output port number (default: ask)')
80+
padd('-v', '--verbose', action="store_true",
81+
help='verbose output')
82+
padd('filterargs', nargs="*", type=int,
83+
help='MIDI filter argument(s)')
8484

8585
args = parser.parse_args(args if args is not None else sys.argv[1:])
8686

8787
logging.basicConfig(format="%(name)s: %(levelname)s - %(message)s",
88-
level=logging.DEBUG if args.verbose else logging.WARNING,)
88+
level=logging.DEBUG if args.verbose else logging.INFO)
8989

9090
try:
9191
midiin, inport_name = open_midiport(args.inport, "input")

examples/midifilter/filters.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
#
55
"""Collection MIDI filter classes."""
66

7+
from rtmidi.midiconstants import (BANK_SELECT_LSB, BANK_SELECT_MSB, CHANNEL_PRESSURE,
8+
CONTROLLER_CHANGE, NOTE_ON, NOTE_OFF, PROGRAM_CHANGE)
9+
10+
711
__all__ = (
812
'CCToBankChange',
913
'MapControllerValue',
@@ -12,8 +16,6 @@
1216
'Transpose',
1317
)
1418

15-
from rtmidi.midiconstants import *
16-
1719

1820
class MidiFilter(object):
1921
"""ABC for midi filters."""

examples/osc2midi/device.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,13 @@
44
#
55
"""MIDI device abstraction classes."""
66

7-
__all__ = [
8-
"RtMidiDevice"
9-
]
10-
117
import logging
128
import time
139

14-
import rtmidi
10+
from rtmidi.midiutil import open_midioutput
1511

16-
from rtmidi.midiutil import open_midiport
1712

13+
__all__ = ["RtMidiDevice"]
1814
log = logging.getLogger(__name__)
1915

2016

@@ -31,8 +27,8 @@ def __str__(self):
3127
return self.portname
3228

3329
def open_output(self):
34-
self._output, self.portname = open_midiport(self.port, "output",
35-
interactive=False, client_name=self.name)
30+
self._output, self.portname = open_midioutput(self.port, interactive=False,
31+
client_name=self.name)
3632

3733
def close_output(self):
3834
if self._output is not None:

0 commit comments

Comments
 (0)