Sourcery refactored master branch #34

sourcery-ai · 2020-06-16T06:02:28Z

Branch master refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

sourcery-ai · 2020-06-16T06:02:29Z

rv/note.py

-        tokens = []
-        for attr in ["note", "vel", "ctl", "val"]:
-            if hasattr(self, attr):
-                tokens.append("%s%i" % (attr[0], getattr(self, attr)))
+        tokens = [
+            "%s%i" % (attr[0], getattr(self, attr))
+            for attr in ["note", "vel", "ctl", "val"]
+            if hasattr(self, attr)
+        ]
+


Function Note.__str__ refactored with the following changes:

Convert for loop into list comprehension

sourcery-ai · 2020-06-16T06:02:29Z

rv/note.py

-        if self.vel == 0:
-            vv = "  "
-        else:
-            vv = "{:02X}".format(self.vel - 1)
-        if self.module == 0:
-            mmmm = "    "
-        else:
-            mmmm = "{:04X}".format(self.module - 1)
+        vv = "  " if self.vel == 0 else "{:02X}".format(self.vel - 1)
+        mmmm = "    " if self.module == 0 else "{:04X}".format(self.module - 1)


Function Note.tabular_repr refactored with the following changes:

Split conditional into multiple branches

Merge duplicate blocks in conditional

Remove redundant conditional

Replace if statement with if expression

sourcery-ai · 2020-06-16T06:02:29Z

rv/pattern.py

-            for track_no in range(self.tracks):
+            for _ in range(self.tracks):


Function Pattern.clear refactored with the following changes:

Replace unused for index with underscore

sourcery-ai · 2020-06-16T06:02:29Z

rv/project.py

-                for chunk in pattern.iff_chunks():
-                    yield chunk
+                yield from pattern.iff_chunks()
            yield (b"PEND", b"")
        for i, module in enumerate(self.modules):
            if module is not None:
-                for chunk in module.iff_chunks():
-                    yield chunk
+                yield from module.iff_chunks()


Function Project.chunks refactored with the following changes:

Simplify sequence comparison

Replace yield inside for loop with yield from

sourcery-ai · 2020-06-16T06:02:30Z

rv/project.py

-            pattern_lines = []
-            for index, pattern in active_patterns:
-                pattern_lines.append(
-                    PatternLine(index, pattern.source or index, line - pattern.x)
-                )
+            pattern_lines = [
+                PatternLine(index, pattern.source or index, line - pattern.x)
+                for index, pattern in active_patterns
+            ]
+


Function Project.pattern_lines refactored with the following changes:

Convert for loop into list comprehension

sourcery-ai · 2020-06-16T06:02:32Z

rv/modules/multictl.py

-        if chunk.chnm == 1:
+        elif chunk.chnm == 1:


Function MultiCtl.load_chunk refactored with the following changes:

Simplify conditional into switch-like form

sourcery-ai · 2020-06-16T06:02:32Z

rv/modules/multictl.py

-        if gains and len(gains) == 1:
-            gain = list(gains).pop()
-        else:
-            gain = 256
+        gain = list(gains).pop() if gains and len(gains) == 1 else 256


Function MultiCtl.macro refactored with the following changes:

Replace if statement with if expression

sourcery-ai · 2020-06-16T06:02:32Z

rv/modules/multisynth.py

-        for chunk in self.nv_curve.chunks():
-            yield chunk
-        for chunk in super(MultiSynth, self).specialized_iff_chunks():
-            yield chunk
-        for chunk in self.vv_curve.chunks():
-            yield chunk
+        yield from self.nv_curve.chunks()
+        yield from super(MultiSynth, self).specialized_iff_chunks()
+        yield from self.vv_curve.chunks()


Function MultiSynth.specialized_iff_chunks refactored with the following changes:

Replace yield inside for loop with yield from

sourcery-ai · 2020-06-16T06:02:33Z

rv/modules/sampler.py

-            for chunk in iter:
-                yield chunk
-        for chunk in super(Sampler, self).specialized_iff_chunks():
-            yield chunk
+            yield from iter
+        yield from super(Sampler, self).specialized_iff_chunks()
        for i, sample in enumerate(self.samples):
            if sample is not None:
-                for chunk in self.sample_chunks(i, sample):
-                    yield chunk
+                yield from self.sample_chunks(i, sample)


Function Sampler.specialized_iff_chunks refactored with the following changes:

Replace yield inside for loop with yield from

sourcery-ai · 2020-06-16T06:02:33Z

rv/modules/spectravoice.py

-        for chunk in self.harmonic_freqs.chunks():
-            yield chunk
-        for chunk in self.harmonic_volumes.chunks():
-            yield chunk
-        for chunk in self.harmonic_widths.chunks():
-            yield chunk
-        for chunk in self.harmonic_types.chunks():
-            yield chunk
-        for chunk in super(SpectraVoice, self).specialized_iff_chunks():
-            yield chunk
+        yield from self.harmonic_freqs.chunks()
+        yield from self.harmonic_volumes.chunks()
+        yield from self.harmonic_widths.chunks()
+        yield from self.harmonic_types.chunks()
+        yield from super(SpectraVoice, self).specialized_iff_chunks()


Function SpectraVoice.specialized_iff_chunks refactored with the following changes:

Replace yield inside for loop with yield from

sourcery-ai · 2020-06-16T06:02:35Z

rv/modules/vorbisplayer.py

-        for chunk in super(VorbisPlayer, self).specialized_iff_chunks():
-            yield chunk
+        yield from super(VorbisPlayer, self).specialized_iff_chunks()


Function VorbisPlayer.specialized_iff_chunks refactored with the following changes:

Replace yield inside for loop with yield from

sourcery-ai · 2020-06-16T06:02:35Z

rv/modules/waveshaper.py

-        for chunk in self.curve.chunks():
-            yield chunk
-        for chunk in super(WaveShaper, self).specialized_iff_chunks():
-            yield chunk
+        yield from self.curve.chunks()
+        yield from super(WaveShaper, self).specialized_iff_chunks()


Function WaveShaper.specialized_iff_chunks refactored with the following changes:

Replace yield inside for loop with yield from

sourcery-ai · 2020-06-16T06:02:36Z

rv/readers/module.py

-        if self._index > 0:
-            self.object = Module(index=self._index)
-        else:
-            self.object = Output()
+        self.object = Module(index=self._index) if self._index > 0 else Output()


Function ModuleReader.process_chunks refactored with the following changes:

Replace if statement with if expression

sourcery-ai · 2020-06-16T06:02:36Z

rv/readers/module.py

-        self._controller_keys = list(
+        self._controller_keys = [
            name
            for name, controller in new_module.controllers.items()
            if controller.attached(new_module)
-        )
+        ]
+


Function ModuleReader.process_STYP refactored with the following changes:

Replace list(), dict() or set() with comprehension

sourcery-ai · 2020-06-16T06:02:36Z

rv/readers/module.py

-        links = self.object.incoming_links
        if len(data) > 0:
            link_count = len(data) // 4
            structure = "<" + "i" * link_count
+            links = self.object.incoming_links


Function ModuleReader.process_SLNK refactored with the following changes:

Move assignments closer to their usage

sourcery-ai · 2020-06-16T06:02:36Z

rv/tools/patch_decompiler.py

-        return (
+        return ((
            (p[0] == q[0] and abs(p[1] - q[1]) == 1)
            or (p[1] == q[1] and abs(p[0] - q[0]) == 1)
-        ) and not ((abs(p[0] - q[0]) == 1) and abs(p[1] - q[1]) == 1)
+        )) and (abs(p[0] - q[0]) != 1 or abs(p[1] - q[1]) != 1)


Function module_layout.is_neighbour refactored with the following changes:

Simplify logical expression

sourcery-ai · 2020-06-16T06:02:37Z

rv/tools/patch_decompiler.py

-        for i in range(n - 1):
+        for _ in range(n - 1):


Function module_layout.sample refactored with the following changes:

Replace unused for index with underscore

sourcery-ai · 2020-06-16T06:02:37Z

rv/tools/patch_decompiler.py

-            return sum([(s[i] - head[i]) ** 2 for i in range(2)])
+            return sum((s[i] - head[i]) ** 2 for i in range(2))


Function module_layout.compactness.err refactored with the following changes:

Replace unneeded comprehension with generator

sourcery-ai · 2020-06-16T06:02:37Z

rv/tools/patch_decompiler.py

-        for i in range(tries):
+        for _ in range(tries):


Function module_layout.best refactored with the following changes:

Replace unused for index with underscore

sourcery-ai · 2020-06-16T06:02:37Z

rv/tools/patch_decompiler.py

-    npatches = len(list(set([patch["name"] for patch in patches])))
+    npatches = len(list({patch["name"] for patch in patches}))


Function main refactored with the following changes:

Replace unneeded comprehension with generator

Replace list(), dict() or set() with comprehension

Refactored by Sourcery

b944194

sourcery-ai bot commented Jun 16, 2020

View reviewed changes

black formatting

280aec9

matthewryanscott force-pushed the sourcery/master branch from c6963ab to 280aec9 Compare June 16, 2020 06:03

matthewryanscott merged commit 36d44af into master Jun 16, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch #34

Sourcery refactored master branch #34

sourcery-ai bot commented Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

sourcery-ai bot Jun 16, 2020

		for track_no in range(self.tracks):
		for _ in range(self.tracks):

		return sum([(s[i] - head[i]) ** 2 for i in range(2)])
		return sum((s[i] - head[i]) ** 2 for i in range(2))

		npatches = len(list(set([patch["name"] for patch in patches])))
		npatches = len(list({patch["name"] for patch in patches}))

Sourcery refactored master branch #34

Sourcery refactored master branch #34

Conversation

sourcery-ai bot commented Jun 16, 2020

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 16, 2020

Choose a reason for hiding this comment