[POC] all: fix deepsource checks

.deepsource.toml

@@ -0,0 +1,10 @@
+version = 1
+
+test_patterns = ["test/**"]
+
+[[analyzers]]
+name = "python"
+enabled = true
+
+  [analyzers.meta]
+  runtime_version = "3.x.x"

docs/source/conf.py

@@ -11,7 +11,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import os
 parentdir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 os.sys.path.insert(0,parentdir)
 from sopel import __version__

sopel/bot.py

@@ -79,7 +79,7 @@ def __init__(self, config, daemon=False):
         For servers that do not support IRCv3, this will be an empty set.
         """
 
-        self.privileges = dict()
+        self.privileges = {}
         """A dictionary of channels to their users and privilege levels.
 
         The value associated with each channel is a dictionary of
@@ -684,7 +684,7 @@ def call_rule(self, rule, sopel, trigger):
 
                 if '*' in disabled_plugins:
                     return
-                elif rule.get_plugin_name() in disabled_plugins:
+                if rule.get_plugin_name() in disabled_plugins:
                     return
 
             # disable chosen methods from plugins
@@ -714,11 +714,11 @@ def call(self, func, sopel, trigger):
         nick = trigger.nick
         current_time = time.time()
         if nick not in self._times:
-            self._times[nick] = dict()
+            self._times[nick] = {}
         if self.nick not in self._times:
-            self._times[self.nick] = dict()
+            self._times[self.nick] = {}
         if not trigger.is_privmsg and trigger.sender not in self._times:
-            self._times[trigger.sender] = dict()
+            self._times[trigger.sender] = {}
 
         if not trigger.admin and not func.unblockable:
             if func in self._times[nick]:
@@ -1280,8 +1280,7 @@ def kick(self, nick, channel=None, message=None):
         if channel is None:
             if self._trigger.is_privmsg:
                 raise RuntimeError('Error: KICK requires a channel.')
-            else:
-                channel = self._trigger.sender
+            channel = self._trigger.sender
         if nick is None:
             raise RuntimeError('Error: KICK requires a nick.')
         self._bot.kick(nick, channel, message)

sopel/cli/config.py

@@ -123,7 +123,7 @@ def handle_init(options):
     if ext and ext != '.cfg':
         tools.stderr('Configuration wizard accepts .cfg files only')
         return 1
-    elif not ext:
+    if not ext:
         config_filename = config_name + '.cfg'
 
     if os.path.isfile(config_filename):
@@ -180,7 +180,7 @@ def main():
     # init command does not require existing settings
     if action == 'list':
         return handle_list(options)
-    elif action == 'init':
+    if action == 'init':
         return handle_init(options)
-    elif action == 'get':
+    if action == 'get':
         return handle_get(options)

sopel/cli/plugins.py

@@ -538,11 +538,11 @@ def main():
 
     if action == 'list':
         return handle_list(options)
-    elif action == 'show':
+    if action == 'show':
         return handle_show(options)
-    elif action == 'configure':
+    if action == 'configure':
         return handle_configure(options)
-    elif action == 'disable':
+    if action == 'disable':
         return handle_disable(options)
-    elif action == 'enable':
+    if action == 'enable':
         return handle_enable(options)

sopel/cli/run.py

@@ -572,7 +572,7 @@ def command_legacy(opts):
     if opts.version:
         print_version()
         return
-    elif opts.version_legacy:
+    if opts.version_legacy:
         tools.stderr(
             'WARNING: option -v is deprecated; '
             'use `sopel -V/--version` instead')
@@ -625,14 +625,14 @@ def command_legacy(opts):
             tools.stderr(
                 'Try using either the `sopel stop` command or the `sopel restart` command')
             return ERR_CODE
-        elif opts.kill:
+        if opts.kill:
             tools.stderr(
                 'WARNING: option -k/--kill is deprecated; '
                 'use `sopel stop --kill` instead')
             tools.stderr('Killing the Sopel')
             os.kill(old_pid, signal.SIGKILL)
             return
-        elif opts.quit:
+        if opts.quit:
             tools.stderr(
                 'WARNING: options -q/--quit is deprecated; '
                 'use `sopel stop` instead')
@@ -644,7 +644,7 @@ def command_legacy(opts):
                 # https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/signal
                 os.kill(old_pid, signal.SIGTERM)
             return
-        elif opts.restart:
+        if opts.restart:
             tools.stderr(
                 'WARNING: options --restart is deprecated; '
                 'use `sopel restart` instead')

sopel/config/__init__.py

@@ -156,8 +156,7 @@ def homedir(self):
             configured = self.parser.get('core', 'homedir')
         if configured:
             return configured
-        else:
-            return os.path.dirname(self.filename)
+        return os.path.dirname(self.filename)
 
     def get_defined_sections(self):
         """Retrieve all defined static sections of this configuration.
@@ -276,7 +275,7 @@ def define_section(self, name, cls_, validate=True):
         current_name = str(current.__class__)
         new_name = str(cls_)
         if (current is not None and not isinstance(current, self.ConfigSection) and
-                not current_name == new_name):
+                current_name != new_name):
             raise ValueError(
                 "Can not re-define class for section from {} to {}.".format(
                     current_name, new_name)
@@ -345,9 +344,8 @@ def __getattr__(self, name):
             section = self.ConfigSection(name, items, self)  # Return a section
             setattr(self, name, section)
             return section
-        else:
-            raise AttributeError("%r object has no attribute %r"
-                                 % (type(self).__name__, name))
+        raise AttributeError("%r object has no attribute %r"
+                             % (type(self).__name__, name))
 
     def __getitem__(self, name):
         return self.__getattr__(name)

sopel/config/types.py

@@ -477,7 +477,7 @@ def serialize(self, value):
         """
         if not isinstance(value, (list, set)):
             raise ValueError('ListAttribute value must be a list.')
-        elif not value:
+        if not value:
             # return an empty string when there is no value
             return ''
 
@@ -553,8 +553,7 @@ def parse(self, value):
         """
         if value in self.choices:
             return value
-        else:
-            raise ValueError('Value must be in {}'.format(self.choices))
+        raise ValueError('Value must be in {}'.format(self.choices))
 
     def serialize(self, value):
         """Make sure ``value`` is valid and safe to write in the config file.
@@ -566,8 +565,7 @@ def serialize(self, value):
         """
         if value in self.choices:
             return value
-        else:
-            raise ValueError('Value must be in {}'.format(self.choices))
+        raise ValueError('Value must be in {}'.format(self.choices))
 
 
 class FilenameAttribute(BaseValidated):

sopel/coretasks.py

@@ -184,7 +184,7 @@ def startup(bot, trigger):
             modes = '+' + modes
         bot.write(('MODE', bot.nick, modes))
 
-    bot.memory['retry_join'] = dict()
+    bot.memory['retry_join'] = {}
 
     channels = bot.config.core.channels
     if not channels:
@@ -330,7 +330,7 @@ def handle_names(bot, trigger):
         return
     channel = Identifier(channels.group(1))
     if channel not in bot.privileges:
-        bot.privileges[channel] = dict()
+        bot.privileges[channel] = {}
     if channel not in bot.channels:
         bot.channels[channel] = target.Channel(channel)
 
@@ -592,7 +592,7 @@ def track_join(bot, trigger):
     # is it a new channel?
     if channel not in bot.channels:
         LOGGER.info('Channel joined: %s', channel)
-        bot.privileges[channel] = dict()
+        bot.privileges[channel] = {}
         bot.channels[channel] = target.Channel(channel)
 
     # did *we* just join?
@@ -1068,7 +1068,7 @@ def _record_who(bot, channel, user, host, nick, account=None, away=None, modes=N
         bot.channels[channel] = target.Channel(channel)
     bot.channels[channel].add_user(usr, privs=priv)
     if channel not in bot.privileges:
-        bot.privileges[channel] = dict()
+        bot.privileges[channel] = {}
     bot.privileges[channel][nick] = priv
 
 

sopel/db.py

@@ -858,8 +858,7 @@ def get_nick_or_channel_value(self, name, key, default=None):
         name = Identifier(name)
         if name.is_nick():
             return self.get_nick_value(name, key, default)
-        else:
-            return self.get_channel_value(name, key, default)
+        return self.get_channel_value(name, key, default)
 
     def get_preferred_value(self, names, key):
         """Get a value for the first name which has it set.

sopel/formatting.py

@@ -221,10 +221,9 @@ def _get_hex_color(color):
 
     if len(color) == 3:
         return ''.join([c * 2 for c in color])
-    elif len(color) == 6:
+    if len(color) == 6:
         return color
-    else:  # invalid length
-        raise ValueError('Hexadecimal color value must have either 3 or 6 digits.')
+    raise ValueError('Hexadecimal color value must have either 3 or 6 digits.')
 
 
 def hex_color(text, fg=None, bg=None):

sopel/irc/__init__.py

@@ -76,7 +76,7 @@ def __init__(self, settings):
         """Bot settings."""
         self.enabled_capabilities = set()
         """A set containing the IRCv3 capabilities that the bot has enabled."""
-        self._cap_reqs = dict()
+        self._cap_reqs = {}
         """A dictionary of capability names to a list of requests."""
 
         # internal machinery

sopel/irc/backends.py

@@ -315,8 +315,7 @@ def recv(self, buffer_size):
                           asyncore.ESHUTDOWN):
                 self.handle_close()
                 return ''
-            elif why[0] == errno.ENOENT:
+            if why[0] == errno.ENOENT:
                 # Required in order to keep it non-blocking
                 return b''
-            else:
-                raise
+            raise

sopel/modules/choose.py

@@ -35,7 +35,7 @@ def _format_safe(text):
     """
     if not isinstance(text, str):
         raise TypeError("A string is required.")
-    elif not text:
+    if not text:
         # unnecessary optimization
         return ''
 

sopel/modules/currency.py

@@ -70,8 +70,6 @@ def __init__(self, status):
 
 class UnsupportedCurrencyError(Exception):
     """A currency is currently not supported by the API"""
-    def __init__(self, currency):
-        super(UnsupportedCurrencyError, self).__init__(currency)
 
 
 def build_reply(amount, base, target, out_string):

sopel/modules/dice.py

@@ -57,14 +57,13 @@ def drop_lowest(self, n):
             count = self.dice[i]
             if n == 0:
                 break
-            elif n < count:
+            if n < count:
                 self.dice[i] = count - n
                 self.dropped[i] = n
                 break
-            else:
-                self.dice[i] = 0
-                self.dropped[i] = count
-                n = n - count
+            self.dice[i] = 0
+            self.dropped[i] = count
+            n = n - count
 
         for i, count in self.dropped.items():
             if self.dice[i] == 0:
@@ -215,10 +214,9 @@ def _get_eval_str(dice):
     def _get_pretty_str(dice):
         if dice.num <= 10:
             return dice.get_simple_string()
-        elif dice.get_number_of_faces() <= 10:
+        if dice.get_number_of_faces() <= 10:
             return dice.get_compressed_string()
-        else:
-            return "(...)"
+        return "(...)"
 
     eval_str = arg_str % (tuple(map(_get_eval_str, dice)))
     pretty_str = arg_str % (tuple(map(_get_pretty_str, dice)))

sopel/modules/find.py

@@ -53,7 +53,7 @@ def collectlines(bot, trigger):
     if line.startswith("s/"):  # Don't remember substitutions
         return
     # store messages in reverse order (most recent first)
-    elif line.startswith("\x01ACTION"):  # For /me messages
+    if line.startswith("\x01ACTION"):  # For /me messages
         line = line[:-1]
         line_list.appendleft(line)
     else:
@@ -180,7 +180,7 @@ def repl(s):
         return  # Didn't find anything
 
     # Save the new "edited" message.
-    action = (me and '\x01ACTION ') or ''  # If /me message, prepend \x01ACTION
+    action = '\x01ACTION ' if me else ''  # If /me message, prepend \x01ACTION
     history.appendleft(action + new_phrase)  # history is in most-recent-first order
 
     # output

sopel/modules/help.py

@@ -78,9 +78,8 @@ def post_to_clbin(msg):
         # find/replace just in case the site tries to be sneaky and save on SSL overhead,
         # though it will probably send us an HTTPS link without any tricks.
         return result.replace('http://', 'https://', 1)
-    else:
-        LOGGER.error("Invalid result %s", result)
-        raise PostingException('clbin result did not contain expected URL base.')
+    LOGGER.error("Invalid result %s", result)
+    raise PostingException('clbin result did not contain expected URL base.')
 
 
 def post_to_0x0(msg):
@@ -94,9 +93,8 @@ def post_to_0x0(msg):
         # find/replace just in case the site tries to be sneaky and save on SSL overhead,
         # though it will probably send us an HTTPS link without any tricks.
         return result.replace('http://', 'https://', 1)
-    else:
-        LOGGER.error('Invalid result %s', result)
-        raise PostingException('0x0.st result did not contain expected URL base.')
+    LOGGER.error('Invalid result %s', result)
+    raise PostingException('0x0.st result did not contain expected URL base.')
 
 
 def post_to_hastebin(msg):

sopel/modules/ip.py

@@ -81,17 +81,16 @@ def _find_geoip_db(bot):
         ipasnum_db = os.path.join(config.ip.GeoIP_db_path, 'GeoLite2-ASN.mmdb')
         if (os.path.isfile(cities_db) and os.path.isfile(ipasnum_db)):
             return config.ip.GeoIP_db_path
-        else:
-            LOGGER.warning(
-                'GeoIP path configured but DB not found in configured path')
+        LOGGER.warning(
+            'GeoIP path configured but DB not found in configured path')
 
     if (os.path.isfile(os.path.join(config.core.homedir, 'GeoLite2-City.mmdb')) and
             os.path.isfile(os.path.join(config.core.homedir, 'GeoLite2-ASN.mmdb'))):
         return config.core.homedir
-    elif (os.path.isfile(os.path.join('/usr/share/GeoIP', 'GeoLite2-City.mmdb')) and
+    if (os.path.isfile(os.path.join('/usr/share/GeoIP', 'GeoLite2-City.mmdb')) and
             os.path.isfile(os.path.join('/usr/share/GeoIP', 'GeoLite2-ASN.mmdb'))):
         return '/usr/share/GeoIP'
-    elif urlretrieve:
+    if urlretrieve:
         LOGGER.info('Downloading GeoIP database')
         bot.say('Downloading GeoIP database, please wait...')
 
@@ -113,8 +112,7 @@ def _find_geoip_db(bot):
             urlretrieve(url, full_path)
             _decompress(full_path, config.core.homedir)
         return bot.config.core.homedir
-    else:
-        return False
+    return False
 
 
 @plugin.command('iplookup', 'ip')