Merge pull request #161 from TotallyNotRobots/tvdb-update

Update tvdb API

Author: linuxdaemon

.coveragerc

@@ -7,6 +7,7 @@ exclude_lines =
     if __name__ == .__main__.:
     if sys.version_info
     class .*\(.*(Error|Exception)\):
+    ^ *\.\.\.$
 
 [run]
 omit =

CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update mylife.py for website changes
 - Fixed handling of colons in core IRC parser
 - Fix FML random URL
+- Update tvdb.py to v3 TVDB API
 ### Removed
 - twitch.py removed due to outdated API and lack of maintainer
 

README.md

@@ -84,9 +84,12 @@ This product includes GeoLite2 data created by MaxMind, available from
 
 ![Powered by wordnik](https://www.wordnik.com/img/wordnik_badge_a1.png)
 
+TV information is provided by [TheTVDB.com], but we are not endorsed or certified by [TheTVDB.com] or its affiliates.
+
 Translations are Powered by [Yandex.Translate](https://translate.yandex.com)
 
 This product uses data from <a href="http://wordnik.com">http://wordnik.com</a> in accordance with the wordnik.com API <a href="http://developer.wordnik.com/#!/terms">terms of service</a>.
 
 [latest source]: https://github.com/TotallyNotRobots/CloudBot/archive/master.zip
 [latest release]: https://github.com/TotallyNotRobots/CloudBot/releases/latest
+[TheTVDB.com]: https://thetvdb.com/

cloudbot/__init__.py

@@ -1,17 +1,17 @@
+import json
+import logging
+import logging.config
+import os
 import sys
 
 # check python version
 if sys.version_info < (3, 5, 3):
     print("CloudBot requires Python 3.5.3 or newer.")
     sys.exit(1)
 
-import json
-import logging.config
-import logging
-import os
 
 version = (1, 3, 0)
-__version__ = '.'.join(str(i) for i in version)
+__version__ = ".".join(str(i) for i in version)
 
 __all__ = (
     "clients",
@@ -52,40 +52,41 @@ def _setup():
         logging_config = {}
 
     file_log = logging_config.get("file_log", False)
-    console_level = "INFO" if logging_config.get("console_log_info", True) else "WARNING"
+    console_level = (
+        "INFO" if logging_config.get("console_log_info", True) else "WARNING"
+    )
 
     logging_info.dir = os.path.join(os.path.abspath(os.path.curdir), "logs")
 
     logging_info.make_dir()
 
     logging.captureWarnings(True)
 
+    logger_names = ["cloudbot", "plugins"]
+
     dict_config = {
         "version": 1,
         "formatters": {
             "brief": {
                 "format": "[%(asctime)s] [%(levelname)s] %(message)s",
-                "datefmt": "%H:%M:%S"
+                "datefmt": "%H:%M:%S",
             },
             "full": {
                 "format": "[%(asctime)s] [%(levelname)s] %(message)s",
-                "datefmt": "%Y-%m-%d][%H:%M:%S"
-            }
+                "datefmt": "%Y-%m-%d][%H:%M:%S",
+            },
         },
         "handlers": {
             "console": {
                 "class": "logging.StreamHandler",
                 "formatter": "brief",
                 "level": console_level,
-                "stream": "ext://sys.stdout"
+                "stream": "ext://sys.stdout",
             }
         },
         "loggers": {
-            "cloudbot": {
-                "level": "DEBUG",
-                "handlers": ["console"]
-            }
-        }
+            name: {"level": "DEBUG", "handlers": ["console"]} for name in logger_names
+        },
     }
 
     if file_log:
@@ -96,17 +97,15 @@ def _setup():
             "formatter": "full",
             "level": "INFO",
             "encoding": "utf-8",
-            "filename": logging_info.add_path("bot.log")
+            "filename": logging_info.add_path("bot.log"),
         }
 
-        dict_config["loggers"]["cloudbot"]["handlers"].append("file")
+        for name in logger_names:
+            dict_config["loggers"][name]["handlers"].append("file")
 
     if logging_config.get("console_debug", False):
         dict_config["handlers"]["console"]["level"] = "DEBUG"
-        dict_config["loggers"]["asyncio"] = {
-            "level": "DEBUG",
-            "handlers": ["console"]
-        }
+        dict_config["loggers"]["asyncio"] = {"level": "DEBUG", "handlers": ["console"]}
         if file_log:
             dict_config["loggers"]["asyncio"]["handlers"].append("file")
 
@@ -118,9 +117,10 @@ def _setup():
             "formatter": "full",
             "encoding": "utf-8",
             "level": "DEBUG",
-            "filename": logging_info.add_path("debug.log")
+            "filename": logging_info.add_path("debug.log"),
         }
-        dict_config["loggers"]["cloudbot"]["handlers"].append("debug_file")
+        for name in logger_names:
+            dict_config["loggers"][name]["handlers"].append("debug_file")
 
     logging.config.dictConfig(dict_config)
 

cloudbot/util/func_utils.py

@@ -4,7 +4,7 @@
 class ParameterError(Exception):
     def __init__(self, name, valid_args):
         super().__init__(
-            "'{}' is not a valid parameter, valid parameters are: {}".format(
+            "{!r} is not a valid parameter, valid parameters are: {}".format(
                 name, list(valid_args)
             )
         )
@@ -13,9 +13,11 @@ def __init__(self, name, valid_args):
 
 
 def call_with_args(func, arg_data):
-    sig = inspect.signature(func)
+    sig = inspect.signature(func, follow_wrapped=False)
     try:
-        args = [arg_data[key] for key in sig.parameters.keys() if not key.startswith('_')]
+        args = [
+            arg_data[key] for key in sig.parameters.keys() if not key.startswith("_")
+        ]
     except KeyError as e:
         raise ParameterError(e.args[0], arg_data.keys()) from e