Sourcery Starbot ⭐ refactored sudharsan2020/python-mastery #2

SourceryAI · 2023-09-04T07:58:56Z

Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨

Here's your pull request refactoring your most popular Python repo.

If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.

Review changes via command line

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

git fetch https://github.com/sourcery-ai-bot/python-mastery main
git merge --ff-only FETCH_HEAD
git reset HEAD^

SourceryAI

Due to GitHub API limits, only the first 60 comments can be shown.

SourceryAI · 2023-09-04T07:58:58Z

Data/stocksim.py

 def csv_record(fields):
-    s = '"%s",%0.2f,"%s","%s",%0.2f,%0.2f,%0.2f,%0.2f,%d' % tuple(fields)
-    return s
+    return '"%s",%0.2f,"%s","%s",%0.2f,%0.2f,%0.2f,%0.2f,%d' % tuple(fields)


Function csv_record refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2023-09-04T07:58:58Z

Solutions/1_1/art.py


 def draw(rows, columns):
-    for r in range(rows):
+    for _ in range(rows):


Function draw refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

SourceryAI · 2023-09-04T07:58:58Z

Solutions/2_6/cta.py

-if True:
-    # Part (b)
-    import reader
-    rows = reader.read_csv_as_dicts('../../Data/ctabus.csv',
-                                    [sys.intern, sys.intern, sys.intern, int])
-else:
-    # Part (d) - Challenge
-    import colreader
-    rows = colreader.read_csv_as_columns('../../Data/ctabus.csv', 
-                                         [sys.intern, sys.intern, sys.intern, int])
-
-# --------------------------------------------------
-# Question 1:  How many bus routes are in Chicago?
-# Solution: Use a set to get unique values. 
-
-routes = set()
-for row in rows:
-    routes.add(row['route'])
+# Part (b)
+import reader
+rows = reader.read_csv_as_dicts('../../Data/ctabus.csv',
+                                [sys.intern, sys.intern, sys.intern, int])
+routes = {row['route'] for row in rows}


Lines 10-27 refactored with the following changes:

Remove redundant conditional (remove-redundant-if)

Convert for loop into set comprehension (set-comprehension)

This removes the following comments ( why? ):

# Part (d) - Challenge # -------------------------------------------------- # Question 1: How many bus routes are in Chicago? # Solution: Use a set to get unique values.

SourceryAI · 2023-09-04T07:58:58Z

Solutions/3_3/reader.py

        headers = next(rows)
-        for row in rows:
-            records.append(cls.from_row(row))
+        records.extend(cls.from_row(row) for row in rows)


Function read_csv_as_instances refactored with the following changes:

Replace a for append loop with list extend (for-append-to-extend)

SourceryAI · 2023-09-04T07:58:58Z

Solutions/3_5/reader.py

        headers = next(rows)
-        for row in rows:
-            records.append(cls.from_row(row))
+        records.extend(cls.from_row(row) for row in rows)


Function read_csv_as_instances refactored with the following changes:

Replace a for append loop with list extend (for-append-to-extend)

SourceryAI · 2023-09-04T07:58:59Z

Solutions/3_8/tableformat.py

        print('<tr>', end=' ')
        for h in headers:
-            print('<th>%s</th>' % h, end=' ')
+            print(f'<th>{h}</th>', end=' ')


Function HTMLTableFormatter.headings refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:58:59Z

Solutions/3_8/tableformat.py

        print('<tr>', end=' ')
        for d in rowdata:
-            print('<td>%s</td>' % d, end=' ')
+            print(f'<td>{d}</td>', end=' ')


Function HTMLTableFormatter.row refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:58:59Z

Solutions/3_8/tableformat.py

        formatter_cls = HTMLTableFormatter
    else:
-        raise RuntimeError('Unknown format %s' % name)
+        raise RuntimeError(f'Unknown format {name}')


Function create_formatter refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:58:59Z

Solutions/5_4/typedproperty.py


 def typedproperty(name, expected_type):
-    private_name = '_' + name
+    private_name = f'_{name}'


Function typedproperty refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

SourceryAI · 2023-09-04T07:59:00Z

Solutions/6_1/structure.py

            super().__setattr__(name, value)
        else:
-            raise AttributeError('No attribute %s' % name)
+            raise AttributeError(f'No attribute {name}')


Function Structure.__setattr__ refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:02Z

Solutions/6_1/structure.py

    def __repr__(self):
-        return '%s(%s)' % (type(self).__name__,
-                           ', '.join(repr(getattr(self, name)) for name in self._fields))
+        return f"{type(self).__name__}({', '.join(repr(getattr(self, name)) for name in self._fields)})"


Function Structure.__repr__ refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:02Z

Solutions/6_2/structure.py

            super().__setattr__(name, value)
        else:
-            raise AttributeError('No attribute %s' % name)
+            raise AttributeError(f'No attribute {name}')


Function Structure.__setattr__ refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:02Z

Solutions/6_2/structure.py

    def __repr__(self):
-        return '%s(%s)' % (type(self).__name__,
-                           ', '.join(repr(getattr(self, name)) for name in self._fields))
+        return f"{type(self).__name__}({', '.join(repr(getattr(self, name)) for name in self._fields)})"


Function Structure.__repr__ refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:02Z

Solutions/6_3/structure.py

            super().__setattr__(name, value)
        else:
-            raise AttributeError('No attribute %s' % name)
+            raise AttributeError(f'No attribute {name}')


Function Structure.__setattr__ refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:02Z

Solutions/6_3/structure.py

    def __repr__(self):
-        return '%s(%s)' % (type(self).__name__,
-                           ', '.join(repr(getattr(self, name)) for name in self._fields))
+        return f"{type(self).__name__}({', '.join(repr(getattr(self, name)) for name in self._fields)})"


Function Structure.__repr__ refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:03Z

Solutions/7_6/structure.py

 class StructureMeta(type):
    @classmethod
-    def __prepare__(meta, clsname, bases):
+    def __prepare__(cls, clsname, bases):


Function StructureMeta.__prepare__ refactored with the following changes:

The first argument to class methods should be cls (class-method-first-arg-name)

SourceryAI · 2023-09-04T07:59:03Z

Solutions/7_6/structure.py

-    def __new__(meta, name, bases, methods):
+    def __new__(cls, name, bases, methods):
        methods = methods.maps[0]
-        return super().__new__(meta, name, bases, methods)
+        return super().__new__(cls, name, bases, methods)


Function StructureMeta.__new__ refactored with the following changes:

The first argument to class methods should be cls (class-method-first-arg-name)

SourceryAI · 2023-09-04T07:59:03Z

Solutions/7_6/structure.py

            super().__setattr__(name, value)
        else:
-            raise AttributeError('No attribute %s' % name)
+            raise AttributeError(f'No attribute {name}')


Function Structure.__setattr__ refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:03Z

Solutions/7_6/structure.py

    def __repr__(self):
-        return '%s(%s)' % (type(self).__name__,
-                           ', '.join(repr(getattr(self, name)) for name in self._fields))
+        return f"{type(self).__name__}({', '.join(repr(getattr(self, name)) for name in self._fields)})"


Function Structure.__repr__ refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:03Z

Solutions/7_6/structure.py

-    cls._fields = tuple([v.name for v in validators])
+    cls._fields = tuple(v.name for v in validators)

    # Collect type conversions. The lambda x:x is an identity
    # function that's used in case no expected_type is found.
-    cls._types = tuple([ getattr(v, 'expected_type', lambda x: x)
-                   for v in validators ])
+    cls._types = tuple(
+        getattr(v, 'expected_type', lambda x: x) for v in validators
+    )

    # Create the __init__ method
    if cls._fields:
        cls.create_init()

-    
+


Function validate_attributes refactored with the following changes:

Replace unneeded comprehension with generator [×2] (comprehension-to-generator)

SourceryAI · 2023-09-04T07:59:06Z

Solutions/7_6/structure.py

 def typed_structure(clsname, **validators):
-    cls = type(clsname, (Structure,), validators)
-    return cls
+    return type(clsname, (Structure,), validators)


Function typed_structure refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2023-09-04T07:59:06Z

Solutions/7_6/tableformat.py

        print('<tr>', end=' ')
        for h in headers:
-            print('<th>%s</th>' % h, end=' ')
+            print(f'<th>{h}</th>', end=' ')


Function HTMLTableFormatter.headings refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:06Z

Solutions/7_6/tableformat.py

        print('<tr>', end=' ')
        for d in rowdata:
-            print('<td>%s</td>' % d, end=' ')
+            print(f'<td>{d}</td>', end=' ')


Function HTMLTableFormatter.row refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:06Z

Solutions/7_6/tableformat.py

        formatter_cls = HTMLTableFormatter
    else:
-        raise RuntimeError('Unknown format %s' % name)
+        raise RuntimeError(f'Unknown format {name}')


Function create_formatter refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:06Z

Solutions/8_1/structure.py

 class StructureMeta(type):
    @classmethod
-    def __prepare__(meta, clsname, bases):
+    def __prepare__(cls, clsname, bases):


Function StructureMeta.__prepare__ refactored with the following changes:

The first argument to class methods should be cls (class-method-first-arg-name)

SourceryAI · 2023-09-04T07:59:07Z

Solutions/8_2/structure.py

 def typed_structure(clsname, **validators):
-    cls = type(clsname, (Structure,), validators)
-    return cls
+    return type(clsname, (Structure,), validators)


Function typed_structure refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2023-09-04T07:59:07Z

Solutions/8_2/tableformat.py

        print('<tr>', end=' ')
        for h in headers:
-            print('<th>%s</th>' % h, end=' ')
+            print(f'<th>{h}</th>', end=' ')


Function HTMLTableFormatter.headings refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:07Z

Solutions/8_2/tableformat.py

        print('<tr>', end=' ')
        for d in rowdata:
-            print('<td>%s</td>' % d, end=' ')
+            print(f'<td>{d}</td>', end=' ')


Function HTMLTableFormatter.row refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:07Z

Solutions/8_2/tableformat.py

        formatter_cls = HTMLTableFormatter
    else:
-        raise RuntimeError('Unknown format %s' % name)
+        raise RuntimeError(f'Unknown format {name}')


Function create_formatter refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-09-04T07:59:07Z

Solutions/8_3/structure.py

 class StructureMeta(type):
    @classmethod
-    def __prepare__(meta, clsname, bases):
+    def __prepare__(cls, clsname, bases):


Function StructureMeta.__prepare__ refactored with the following changes:

The first argument to class methods should be cls (class-method-first-arg-name)

'Refactored by Sourcery'

61cf3f1

SourceryAI commented Sep 4, 2023

View reviewed changes

Sourcery Starbot ⭐ refactored sudharsan2020/python-mastery #2

Are you sure you want to change the base?

Sourcery Starbot ⭐ refactored sudharsan2020/python-mastery #2

Uh oh!

Conversation

SourceryAI commented Sep 4, 2023

Uh oh!

SourceryAI left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant