Sourcery Starbot ⭐ refactored evgenytsydenov/python_course #1

SourceryAI · 2022-12-20T14:42:37Z

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_course main
git merge --ff-only FETCH_HEAD
git reset HEAD^

SourceryAI · 2022-12-20T14:42:38Z

exchanger/engine.py

-        match = re.search('.*<(?P<email>.*)>.*', sender)
-        if match:
-            sender = match.group('email')
+        if match := re.search('.*<(?P<email>.*)>.*', sender):
+            sender = match['email']


Function GmailExchanger._extract_email refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Replace m.group(x) with m[x] for re.Match objects (use-getitem-for-re-match-groups)

SourceryAI · 2022-12-20T14:42:38Z

exchanger/engine.py

-        match = re.search('^(?P<label>.*)/(?P<lesson>.*)$', subject)
-        les_name = ''
-        if match:
-            les_name = match.group('lesson')
+        if match := re.search('^(?P<label>.*)/(?P<lesson>.*)$', subject):
+            les_name = match['lesson']
+        else:
+            les_name = ''


Function GmailExchanger._extract_lesson_name refactored with the following changes:

Move setting of default value for variable into else branch (introduce-default-else)

Replace m.group(x) with m[x] for re.Match objects (use-getitem-for-re-match-groups)

Use named expression to simplify assignment and conditional (use-named-expression)

SourceryAI · 2022-12-20T14:42:39Z

exchanger/engine.py

-        label_info = {}
-        for label in all_labels['labels']:
-            if label['name'] == label_name:
-                label_info = label
-                break
+        label_info = next(
+            (
+                label
+                for label in all_labels['labels']
+                if label['name'] == label_name
+            ),
+            {},
+        )
        if label_info:
            logger.debug(f'Gmail label "{label_info}" already exists.')
        else:
            body = {'name': label_name, 'messageListVisibility': 'show',
                    'labelListVisibility': 'labelShow'}
            label_info = self._gmail.users().labels() \
-                .create(userId='me', body=body).execute()
+                    .create(userId='me', body=body).execute()


Function GmailExchanger._get_label_id refactored with the following changes:

Use the built-in function next instead of a for-loop (use-next)

SourceryAI · 2022-12-20T14:42:39Z

exchanger/engine.py

-            .list(userId='me').execute()
+                .list(userId='me').execute()

        # Find if already exist
        criteria = {'to': fetch_alias, 'subject': fetch_keyword}
        action = {'addLabelIds': [label_id],
                  'removeLabelIds': ['INBOX', 'SPAM']}
-        filter_info = {}
-        for gmail_filter in filters['filter']:
-            if (gmail_filter['criteria'] == criteria) \
-                    and (gmail_filter['action'] == action):
-                filter_info = gmail_filter
-                break
-
-        if filter_info:
+        if filter_info := next(
+            (
+                gmail_filter
+                for gmail_filter in filters['filter']
+                if (gmail_filter['criteria'] == criteria)
+                and (gmail_filter['action'] == action)
+            ),
+            {},
+        ):
            logger.debug(f'Filter {filter_info} already exists.')
        else:
            body = {'criteria': criteria, 'action': action}
            self._gmail.users().settings().filters() \
-                .create(userId='me', body=body).execute()
+                    .create(userId='me', body=body).execute()


Function GmailExchanger._create_filter refactored with the following changes:

Use the built-in function next instead of a for-loop (use-next)

Use named expression to simplify assignment and conditional (use-named-expression)

SourceryAI · 2022-12-20T14:42:39Z

exchanger/feedback.py

-                  f'/ {timestamp}'
-        score = sum([task.score for task in grade_result.task_grades])
-        max_score = sum([task.max_score for task in grade_result.task_grades])
+                      f'/ {timestamp}'
+        score = sum(task.score for task in grade_result.task_grades)
+        max_score = sum(task.max_score for task in grade_result.task_grades)


Function FeedbackCreator._get_success_feedback refactored with the following changes:

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

SourceryAI · 2022-12-20T14:42:40Z

publisher/engine.py

-                f"and trashed != True"
-        cloud_file = self._find_cloud_files(query, ['id'])
-        if not cloud_file:
-            logger.debug(f'File or folder "{local_name}" does not exist '
-                         f'in the cloud path "{cloud_folder_path}".')
-            cloud_file_id = self._upload_file(local_file, parent_id)
-        else:
+                    f"and trashed != True"
+        if cloud_file := self._find_cloud_files(query, ['id']):
            cloud_file_id = cloud_file[0]['id']
            logger.debug(f'File or folder "{local_name}" exists '
                         f'in the cloud path "{cloud_folder_path}".')
            self._update_cloud_file(cloud_file_id, local_file)
+        else:
+            logger.debug(f'File or folder "{local_name}" does not exist '
+                         f'in the cloud path "{cloud_folder_path}".')
+            cloud_file_id = self._upload_file(local_file, parent_id)


Function GDrivePublisher.sync refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Swap if/else branches (swap-if-else-branches)

Use any() instead of for loop (use-any)

SourceryAI · 2022-12-20T14:42:40Z

publisher/engine.py

-    def _get_cloud_file(self, file_id: str, attributes: Iterable[str]) \
-            -> Dict[str, Any]:
+    def _get_cloud_file(self, file_id: str, attributes: Iterable[str]) -> Dict[str, Any]:


Function GDrivePublisher._get_cloud_file refactored with the following changes:

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

SourceryAI · 2022-12-20T14:42:40Z

publisher/engine.py

-            for line in file.readlines():
-                if line.strip() and not line.startswith('#'):
-                    patterns.append(line)
+            patterns.extend(
+                line for line in file if line.strip() and not line.startswith('#')
+            )


Function GDrivePublisher._get_ignore_files refactored with the following changes:

Iterate over files directly rather than using readlines() (use-file-iterator)

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

SourceryAI · 2022-12-20T14:42:41Z

utils/app_logger.py

-        if datefmt:
-            return dt.strftime(datefmt)
-        return dt.isoformat()
+        return dt.strftime(datefmt) if datefmt else dt.isoformat()


Function CustomFormatter.formatTime refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

SourceryAI · 2022-12-20T14:42:41Z

utils/smtp_sender.py

-                        f'Content-Disposition',
-                        f'attachment; filename="{file_name}"')
+                        'Content-Disposition',
+                        f'attachment; filename="{file_name}"',
+                    )


Function SMTPSender.send refactored with the following changes:

Replace f-string with no interpolated values with string (remove-redundant-fstring)

'Refactored by Sourcery'

b99d6a8

SourceryAI commented Dec 20, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery Starbot ⭐ refactored evgenytsydenov/python_course #1

Sourcery Starbot ⭐ refactored evgenytsydenov/python_course #1

SourceryAI commented Dec 20, 2022

SourceryAI Dec 20, 2022

SourceryAI Dec 20, 2022

SourceryAI Dec 20, 2022

SourceryAI Dec 20, 2022

SourceryAI Dec 20, 2022

SourceryAI Dec 20, 2022

SourceryAI Dec 20, 2022

SourceryAI Dec 20, 2022

SourceryAI Dec 20, 2022

SourceryAI Dec 20, 2022

Sourcery Starbot ⭐ refactored evgenytsydenov/python_course #1

Are you sure you want to change the base?

Sourcery Starbot ⭐ refactored evgenytsydenov/python_course #1

Conversation

SourceryAI commented Dec 20, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment