Sourcery Starbot ⭐ refactored iranzo/stampython #29

SourceryAI · 2023-05-22T23:17:26Z

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 master branch, then run:

git fetch https://github.com/sourcery-ai-bot/stampython master
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-05-22T23:17:27Z

stampy/env.py

-    # if a database path was provided, override the one in alembic.ini
-    database = context.get_x_argument(as_dictionary=True).get('database')
-    if database:
-        url = "sqlite:///%s" % database
+    if database := context.get_x_argument(as_dictionary=True).get('database'):
+        url = f"sqlite:///{database}"


Function run_migrations_offline refactored with the following changes:

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

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

This removes the following comments ( why? ):

# if a database path was provided, override the one in alembic.ini

SourceryAI · 2023-05-22T23:17:28Z

stampy/env.py

-    # if a database path was provided, override the one in alembic.ini
-    database = context.get_x_argument(as_dictionary=True).get('database')
-    if database:
-        ini_section['sqlalchemy.url'] = "sqlite:///%s" % database
+    if database := context.get_x_argument(as_dictionary=True).get('database'):
+        ini_section['sqlalchemy.url'] = f"sqlite:///{database}"


Function run_migrations_online refactored with the following changes:

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

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

This removes the following comments ( why? ):

# if a database path was provided, override the one in alembic.ini

SourceryAI · 2023-05-22T23:17:28Z

stampy/plugins.py

-        triggers = []
-        for each in newplug.init():
-            triggers.append(each)
+        triggers = list(newplug.init())


Function initplugins refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

Replace identity comprehension with call to collection constructor (identity-comprehension)

SourceryAI · 2023-05-22T23:17:28Z

stampy/stampy.py

-        '-x', 'database=%s' % options.database, '--raiseerr',
-        'upgrade', 'head',
+        '-x',
+        f'database={options.database}',
+        '--raiseerr',
+        'upgrade',
+        'head',


Function createorupdatedb refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:28Z

stampy/stampy.py

-        if "```" in text:
-            markdown = True
-        else:
-            markdown = False
-
-        texto = string.join(lines[0:maxlines], "\n")
+        markdown = "```" in text
+        texto = string.join(lines[:maxlines], "\n")
        if markdown:
-            texto = "%s```" % texto
+            texto = f"{texto}```"


Function sendmessage refactored with the following changes:

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

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

Replace interpolated string formatting with f-string [×6] (replace-interpolation-with-fstring)

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

Simplify boolean if expression (boolean-if-exp-identity)

Remove unnecessary casts to int, str, float or bool (remove-unnecessary-cast)

SourceryAI · 2023-05-22T23:17:30Z

stampy/stampy.py

-            if not admin:
-                if plugin.config.config(key='admin', gid=chat_id, default="") == "":
+            if plugin.config.config(key='admin', gid=chat_id, default="") == "":
+                if not admin:


Function is_owner_or_admin refactored with the following changes:

Swap positions of nested conditionals (swap-nested-ifs)

This removes the following comments ( why? ):

# If we're not admin and admin is empty, consider ourselves admin

SourceryAI · 2023-05-22T23:17:30Z

stampy/stampy.py

-    if plugin.config.gconfig(key='isolated', default=False, gid=gid):
-        # Isolated is defined for either channel or general bot config.
-        # need to check now if group is linked and if so, return that gid,
-        # and if not, return groupid
-
-        link = plugin.config.gconfig(key='link', default=False, gid=gid)
-        if link:
-            # This chat_id has 'link' defined against master, effective gid
-            # should be that one
-            return int(link)
-        else:
-            return gid
-    else:
+    if not plugin.config.gconfig(key='isolated', default=False, gid=gid):
        # Non isolation configured, returning '0' as gid to use
        return 0
+    if link := plugin.config.gconfig(key='link', default=False, gid=gid):
+        # This chat_id has 'link' defined against master, effective gid
+        # should be that one
+        return int(link)
+    else:
+        return gid


Function geteffectivegid refactored with the following changes:

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

Remove unnecessary else after guard condition (remove-unnecessary-else)

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

This removes the following comments ( why? ):

# Isolated is defined for either channel or general bot config. # and if not, return groupid # need to check now if group is linked and if so, return that gid,

SourceryAI · 2023-05-22T23:17:30Z

stampy/plugin/admin.py

    """
-    triggers = ["^/admin"]
-    return triggers
+    return ["^/admin"]


Function init refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:31Z

stampy/plugin/admin.py

-def run(message):  # do not edit this line
+def run(message):    # do not edit this line


Function run refactored with the following changes:

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

SourceryAI · 2023-05-22T23:17:31Z

stampy/plugin/admin.py

-                        token = texto.split(' ')[3]
-                        if token:
+                        if token := texto.split(' ')[3]:


Function admincommands refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:35Z

stampy/plugin/admin.py

-            token = ''.join((random.choice(charset)) for x in range(size))
-            generatedtoken = "%s:%s" % (chat_id, token)
+            token = ''.join((random.choice(charset)) for _ in range(size))
+            generatedtoken = f"{chat_id}:{token}"


Function changenmastertoken refactored with the following changes:

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

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

SourceryAI · 2023-05-22T23:17:35Z

stampy/plugin/admin.py

-    if masterid:
+    if masterid := stampy.plugin.config.config(
+        key='link', default=False, gid=chat_id
+    ):


Function chanunlink refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:35Z

stampy/plugin/admin.py

-    masterid = stampy.plugin.config.config(key='link', default=False, gid=chat_id)
-
-    if masterid:
+    if masterid := stampy.plugin.config.config(
+        key='link', default=False, gid=chat_id
+    ):
        # We've a master channel, report it
        text = _("This channel %s is slave of channel %s") % (chat_id, masterid)
    else:
        # We nee to check database to see if we've any slave
-        sql = "SELECT id from config where key='link' and value='%s'" % chat_id
+        sql = f"SELECT id from config where key='link' and value='{chat_id}'"


Function chanshowslave refactored with the following changes:

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

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

SourceryAI · 2023-05-22T23:17:35Z

stampy/plugin/alias.py

    """
-    triggers = ["^/alias"]
-    return triggers
+    return ["^/alias"]


Function init refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:35Z

stampy/plugin/alias.py

-def run(message):  # do not edit this line
+def run(message):    # do not edit this line


Function run refactored with the following changes:

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

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

SourceryAI · 2023-05-22T23:17:38Z

stampy/plugin/base.py

    """
-    triggers = ["^/quit"]
-    return triggers
+    return ["^/quit"]


Function init refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:38Z

stampy/plugin/base.py

-def run(message):  # do not edit this line
+def run(message):    # do not edit this line


Function run refactored with the following changes:

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

SourceryAI · 2023-05-22T23:17:38Z

stampy/plugin/chuck.py

    """
-    triggers = ["^/cn"]
-    return triggers
+    return ["^/cn"]


Function init refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:38Z

stampy/plugin/chuck.py

-def run(message):  # do not edit this line
+def run(message):    # do not edit this line
    """
    Executes plugin
    :param message: message to run against
    :return:
    """
-    text = stampy.stampy.getmsgdetail(message)["text"]
-    if text:
+    if text := stampy.stampy.getmsgdetail(message)["text"]:


Function run refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:38Z

stampy/plugin/chuck.py

-def help(message):  # do not edit this line
+def help(message):    # do not edit this line
    """
    Returns help for plugin
    :param message: message to process
    :return: help text
    """
-    commandtext = _("Use `/cn <word>` to get a random Chuck Norris quote based on word\n\n")
-    return commandtext
+    return _(
+        "Use `/cn <word>` to get a random Chuck Norris quote based on word\n\n"
+    )


Function help refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:42Z

stampy/plugin/chuck.py

-    logger.debug(msg=_L("Command: %s by %s" % (texto, who_un)))
+    logger.debug(msg=_L(f"Command: {texto} by {who_un}"))


Function cn refactored with the following changes:

Replace interpolated string formatting with f-string [×2] (replace-interpolation-with-fstring)

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

SourceryAI · 2023-05-22T23:17:42Z

stampy/plugin/cleanlink.py

-    triggers = ["*"]
-
-    return triggers
+    return ["*"]


Function init refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:43Z

stampy/plugin/cleanlink.py

-def run(message):  # do not edit this line
+def run(message):    # do not edit this line


Function run refactored with the following changes:

Use f-string instead of string concatenation [×4] (use-fstring-for-concatenation)

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

SourceryAI · 2023-05-22T23:17:43Z

stampy/plugin/cleanlink.py

-def help(message):  # do not edit this line
+def help(message):    # do not edit this line
    """
    Returns help for plugin
    :param message: message to process
    :return: help text
    """
-    commandtext = ""
-    return commandtext
+    return ""


Function help refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:43Z

stampy/plugin/comic.py


    for comic in getcomics():
-        triggers.extend(["/%s" % comic])
+        triggers.extend([f"/{comic}"])


Function init refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:45Z

stampy/plugin/espp.py


-    triggers = ["^/espp"]
-    return triggers
+    return ["^/espp"]


Function init refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:45Z

stampy/plugin/espp.py

-def run(message):  # do not edit this line
+def run(message):    # do not edit this line
    """
    Executes plugin
    :param message: message to run against
    :return:
    """
-    text = stampy.stampy.getmsgdetail(message)["text"]
-    if text:
-        if text.split()[0].lower()[0:5] == "/espp":
+    if text := stampy.stampy.getmsgdetail(message)["text"]:
+        if text.split()[0].lower()[:5] == "/espp":


Function run refactored with the following changes:

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

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

SourceryAI · 2023-05-22T23:17:45Z

stampy/plugin/espp.py

-def help(message):  # do not edit this line
+def help(message):    # do not edit this line
    """
    Returns help for plugin
    :param message: message to process
    :return: help text
    """
-    commandtext = _("Use `/espp <amount>` to get estimated ESPP earnings\n\n")
-    return commandtext
+    return _("Use `/espp <amount>` to get estimated ESPP earnings\n\n")


Function help refactored with the following changes:

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

SourceryAI · 2023-05-22T23:17:45Z

stampy/plugin/espp.py

-    initial = float(stampy.plugin.config.gconfig(key="espp", default=False, gid=chat_id))
-    if initial:
+    if initial := float(
+        stampy.plugin.config.gconfig(key="espp", default=False, gid=chat_id)
+    ):


Function espp refactored with the following changes:

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

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

Replace comparison with min/max call (min-max-identity)

SourceryAI · 2023-05-22T23:17:46Z

stampy/plugin/feed.py

-    triggers = ["^/feed"]
-
    if botname == 'redken_bot':
        stampy.stampy.cronme(name="feed", interval=5)

-    return triggers
+    return ["^/feed"]


Function init refactored with the following changes:

Move assignment closer to its usage within a block (move-assign-in-block)

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

'Refactored by Sourcery'

5a5afda

SourceryAI commented May 22, 2023

View reviewed changes

Fixing style errors.

a5ab1de

SourceryAI commented May 22, 2023

View reviewed changes

		def run(message): # do not edit this line
		def run(message): # do not edit this line

		logger.debug(msg=_L("Command: %s by %s" % (texto, who_un)))
		logger.debug(msg=_L(f"Command: {texto} by {who_un}"))

Sourcery Starbot ⭐ refactored iranzo/stampython #29

Are you sure you want to change the base?

Sourcery Starbot ⭐ refactored iranzo/stampython #29

Uh oh!

Conversation

SourceryAI commented May 22, 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!

2 participants