Increase max line width to 180

impredicative · impredicative · commit 91e3476d9df3 · 2020-06-07T22:08:18.000-04:00
diff --git a/ircurltitlebot/__main__.py b/ircurltitlebot/__main__.py
@@ -28,9 +28,7 @@ def load_config() -> None:
     if "sites" in logged_instance_config:
         del logged_instance_config["sites"]
     log.info(
-        "Read user configuration file %s having excerpted configuration: %s",
-        instance_config_path,
-        logged_instance_config,
+        "Read user configuration file %s having excerpted configuration: %s", instance_config_path, logged_instance_config,
     )
     for site, site_config in instance_config.get("sites", {}).items():
         log.info("User configuration for site %s is: %s", site, site_config)
diff --git a/ircurltitlebot/bot.py b/ircurltitlebot/bot.py
@@ -36,8 +36,7 @@ class Bot:
 
     def __init__(self) -> None:
         log.info(
-            "Initializing bot as: %s",
-            subprocess.check_output("id", text=True).rstrip(),  # pylint: disable=unexpected-keyword-arg
+            "Initializing bot as: %s", subprocess.check_output("id", text=True).rstrip(),  # pylint: disable=unexpected-keyword-arg
         )
         instance = config.INSTANCE
         self._setup_channel_queues()  # Sets up executors and queues required by IRC handler.
@@ -83,19 +82,14 @@ def _msg_channel(self, channel: str) -> NoReturn:  # pylint: disable=too-many-lo
                 user, url, title = result
                 if title.casefold() in title_blacklist:
                     log.info(
-                        "Skipping globally blacklisted title %s for %s in %s for URL %s",
-                        repr(title),
-                        user,
-                        channel,
-                        url,
+                        "Skipping globally blacklisted title %s for %s in %s for URL %s", repr(title), user, channel, url,
                     )
                     continue
                 msg = f"{title_prefix} {title}"
                 if irc.connected:
                     irc.msg(channel, msg)
                     log.info(
-                        "Sent outgoing message for %s in %s in %.1fs having content %s for URL %s with %s "
-                        "active threads.",
+                        "Sent outgoing message for %s in %s in %.1fs having content %s for URL %s with %s " "active threads.",
                         user,
                         channel,
                         time.monotonic() - start_time,
@@ -105,8 +99,7 @@ def _msg_channel(self, channel: str) -> NoReturn:  # pylint: disable=too-many-lo
                     )
                 else:
                     log.warning(
-                        "Skipped outgoing message for %s in %s in %.1fs having content %s for URL %s with %s "
-                        "active threads because the IRC client is not connected.",
+                        "Skipped outgoing message for %s in %s in %.1fs having content %s for URL %s with %s " "active threads because the IRC client is not connected.",
                         user,
                         channel,
                         time.monotonic() - start_time,
@@ -120,46 +113,30 @@ def _setup_channel_queues(self) -> None:
         channels_str = ", ".join(channels)
         active_count = threading.active_count
         log.debug(
-            "Setting up executor and queue for %s channels (%s) with %s currently active threads.",
-            len(channels),
-            channels_str,
-            active_count(),
+            "Setting up executor and queue for %s channels (%s) with %s currently active threads.", len(channels), channels_str, active_count(),
         )
         for channel in channels:
             log.debug("Setting up executor and queue for %s.", channel)
-            self.EXECUTORS[channel] = concurrent.futures.ThreadPoolExecutor(
-                max_workers=config.MAX_WORKERS_PER_CHANNEL, thread_name_prefix=f"TitleReader-{channel}"
-            )
+            self.EXECUTORS[channel] = concurrent.futures.ThreadPoolExecutor(max_workers=config.MAX_WORKERS_PER_CHANNEL, thread_name_prefix=f"TitleReader-{channel}")
             self.QUEUES[channel] = queue.SimpleQueue()
             log.debug(
-                "Finished setting up executor and queue for %s with %s currently active threads.",
-                channel,
-                active_count(),
+                "Finished setting up executor and queue for %s with %s currently active threads.", channel, active_count(),
             )
         log.info(
-            "Finished setting up executor and queue for %s channels (%s) with %s currently active threads.",
-            len(channels),
-            channels_str,
-            active_count(),
+            "Finished setting up executor and queue for %s channels (%s) with %s currently active threads.", len(channels), channels_str, active_count(),
         )
 
     def _setup_channel_threads(self) -> None:
         channels = config.INSTANCE["channels"]
         channels_str = ", ".join(channels)
         active_count = threading.active_count
         log.debug(
-            "Setting up thread for %s channels (%s) with %s currently active threads.",
-            len(channels),
-            channels_str,
-            active_count(),
+            "Setting up thread for %s channels (%s) with %s currently active threads.", len(channels), channels_str, active_count(),
         )
         for channel in channels:
             threading.Thread(target=self._msg_channel, name=f"ChannelMessenger-{channel}", args=(channel,)).start()
         log.info(
-            "Finished setting up thread for %s channels (%s) with %s currently active threads.",
-            len(channels),
-            channels_str,
-            active_count(),
+            "Finished setting up thread for %s channels (%s) with %s currently active threads.", len(channels), channels_str, active_count(),
         )
 
 
@@ -173,10 +150,7 @@ def _get_title(irc: miniirc.IRC, channel: str, user: str, url: str) -> Optional[
         # Note: exc almost always includes the actual URL, so it need not be duplicated in the alert.
         if url.endswith(PUNCTUATION):
             period = "" if msg.endswith(".") else "."
-            msg += (
-                f'{period} It will however be reattempted with its trailing punctuation character "{url[-1]}" '
-                "stripped."
-            )
+            msg += f'{period} It will however be reattempted with its trailing punctuation character "{url[-1]}" ' "stripped."
             log.info(msg)
         else:
             _alert(irc, msg)
@@ -185,12 +159,7 @@ def _get_title(irc: miniirc.IRC, channel: str, user: str, url: str) -> Optional[
     else:
         if title:  # Filter out None or blank title.
             log.debug(
-                'Returning title "%s" for URL %s in message from %s in %s in %.1fs.',
-                title,
-                url,
-                user,
-                channel,
-                time.monotonic() - start_time,
+                'Returning title "%s" for URL %s in message from %s in %s in %.1fs.', title, url, user, channel, time.monotonic() - start_time,
             )
             return user, url, title
     return None
@@ -210,10 +179,7 @@ def _handle_900_loggedin(irc: miniirc.IRC, hostmask: Tuple[str, str, str], args:
     log.info("The client identity as <nick>!<user>@<host> is %s.", identity)
     if nick_casefold != config.INSTANCE["nick:casefold"]:
         _alert(
-            irc,
-            f"The client nick was configured to be {config.INSTANCE['nick']} but it is {nick}. "
-            "The configured nick will be regained.",
-            logging.WARNING,
+            irc, f"The client nick was configured to be {config.INSTANCE['nick']} but it is {nick}. The configured nick will be regained.", logging.WARNING,
         )
         irc.msg("nickserv", "REGAIN", config.INSTANCE["nick"], os.environ["IRC_PASSWORD"])
 
@@ -252,9 +218,7 @@ def _handle_privmsg(irc: miniirc.IRC, hostmask: Tuple[str, str, str], args: List
             # Ignoring private message from freenode-connect having ident frigg
             # and hostname freenode/utility-bot/frigg: VERSION
             _alert(
-                irc,
-                f"Ignoring private message from {user} having ident {ident} and hostname {hostname}: {msg}",
-                logging.WARNING,
+                irc, f"Ignoring private message from {user} having ident {ident} and hostname {hostname}: {msg}", logging.WARNING,
             )
         return
 
diff --git a/ircurltitlebot/config.py b/ircurltitlebot/config.py
@@ -26,18 +26,9 @@ def configure_logging() -> None:
 LOGGING = {  # Ref: https://docs.python.org/3/howto/logging.html#configuring-logging
     "version": 1,
     "formatters": {
-        "detailed": {
-            "format": "%(asctime)s %(levelname)s %(threadName)s:%(name)s:%(lineno)d:%(funcName)s: %(message)s",
-        },  # Note: Use %(thread)x- if needed for thread ID.
-    },
-    "handlers": {
-        "console": {
-            "class": "logging.StreamHandler",
-            "level": "DEBUG",
-            "formatter": "detailed",
-            "stream": "ext://sys.stdout",
-        },
+        "detailed": {"format": "%(asctime)s %(levelname)s %(threadName)s:%(name)s:%(lineno)d:%(funcName)s: %(message)s",},  # Note: Use %(thread)x- if needed for thread ID.
     },
+    "handlers": {"console": {"class": "logging.StreamHandler", "level": "DEBUG", "formatter": "detailed", "stream": "ext://sys.stdout",},},
     "loggers": {
         PACKAGE_NAME: {"level": "INFO", "handlers": ["console"], "propagate": False},
         "urltitle": {"level": "INFO", "handlers": ["console"], "propagate": False},
diff --git a/ircurltitlebot/title.py b/ircurltitlebot/title.py
@@ -30,9 +30,7 @@ def title(self, url: str, channel: str) -> Optional[str]:
 
         # Skip blacklisted title
         blacklist = site_config.get("blacklist", {})
-        if title == blacklist.get("title") or (
-            (bl_re := blacklist.get("title_re")) and re.search(bl_re, title)  # pylint: disable=used-before-assignment
-        ):
+        if title == blacklist.get("title") or ((bl_re := blacklist.get("title_re")) and re.search(bl_re, title)):  # pylint: disable=used-before-assignment
             log.info("Skipping blacklisted title %s for site %s.", repr(title), site)
             return None
 
diff --git a/pylintrc b/pylintrc
@@ -23,4 +23,4 @@ disable=
 output-format=colorized
 
 [FORMAT]
-max-line-length=120
+max-line-length=180
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.black]
-line-length = 120
+line-length = 180
 
 [tool.isort]
-line_Length = 120
+line_Length = 180
diff --git a/setup.cfg b/setup.cfg
@@ -14,7 +14,7 @@ warn_redundant_casts = True
 ignore = E203,E231,E501,E701,E731,W503
 # Ref: http://pycodestyle.pycqa.org/en/stable/intro.html#error-codes
 # Note: These ignores are to make autopep8==1.4.4 work with Python 3.8 assignment expressions: E203,E231,E701
-max-line-length = 120
+max-line-length = 180
 
 [pydocstyle]
 ignore = D100,D101,D102,D103,D104,D105,D106,D107,D203,D213
