Merge branch 'hotfix/0.21.26'

CHANGES.md

@@ -1,4 +1,10 @@
-### 0.21.25 (2020-04-10 01:50:00 UTC)
+### 0.21.26 (2020-04-13 00:30:00 UTC)
+
+* Fix AttributeError in anime manager while editing show (part deux)
+* Fix use lib logger instead of global logger
+
+
+### 0.21.25 (2020-04-10 01:50:00 UTC)
 
 * Fix Kodi uniqueid tag not validated during import
 * Change slightly improve performance iterating metadata providers

lib/_23.py

@@ -30,7 +30,7 @@ if False:
     # resolve typing imports
     # ----------------------
     # noinspection PyUnresolvedReferences
-    from typing import Any, AnyStr, Callable, Dict, Iterator, List, Optional, Tuple, Union
+    from typing import Any, AnyStr, Callable, Dict, Iterable, Iterator, List, Optional, Tuple, Union
     # -------------------
     # resolve pyc imports
     # -------------------
@@ -42,8 +42,8 @@ if False:
 PY38 = version_info[0:2] >= (3, 8)
 
 """ one off consumables (Iterators) """
-filter_iter = moves.filter  # type: Callable[[], Iterator]
-map_iter = moves.map  # type: Callable[[], Iterator]
+filter_iter = moves.filter  # type: Callable[[Callable, Iterable], Iterator]
+map_iter = moves.map  # type: Callable[[Callable, ...], Iterator]
 
 
 def map_consume(*args):

lib/adba/__init__.py

@@ -31,7 +31,7 @@ from .aniDBAbstracter import Anime, Episode
 
 version = 100
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('adba')
 logger.addHandler(logging.NullHandler())
 
 
@@ -189,13 +189,13 @@ class Connection(threading.Thread):
             self._username = username
             self._password = password
             if False is self.is_alive():
-                logging.debug("You wanted to keep this thing alive!")
+                logger.debug("You wanted to keep this thing alive!")
                 if False is self._iamALIVE:
-                    logging.info("Starting thread now...")
+                    logger.info("Starting thread now...")
                     self.start()
                     self._iamALIVE = True
                 else:
-                    logging.info("not starting thread seems like it is already running. this must be a _reAuthenticate")
+                    logger.info("not starting thread seems like it is already running. this must be a _reAuthenticate")
 
         config = ConfigParser()
         config.read(self.SessionFile)
@@ -224,7 +224,7 @@ class Connection(threading.Thread):
             try:
                 self.handle(AuthCommand(username, password, 3, self.clientname, self.clientver, nat, 1, 'utf8', mtu), callback)
             except Exception as error:
-                logger.debug('Auth command with exception %r', error)
+                logger.debug('Auth command with exception %r' % error)
                 # we force a config file with logged out to ensure a known state if an exception occurs, forcing us to log in again
                 config['DEFAULT'] = {'loggedin': 'yes', 'sessionkey': str(self.link.session or ''), 'exception': str(error),
                                      'lastcommandtime': repr(time())}

lib/adba/aniDBAbstracter.py

@@ -30,7 +30,7 @@ from .aniDBfileInfo import read_anidb_xml
 
 from _23 import decode_str
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('adba')
 logger.addHandler(logging.NullHandler())
 
 
@@ -281,7 +281,7 @@ class Episode(aniDBabstractObject):
         try:
             self.aniDB.mylistadd(size=self.size, ed2k=self.ed2k, state=state, viewed=viewed, source=source, storage=storage, other=other)
         except Exception as e:
-            logger.exception("Exception: %s", e)
+            logger.exception("Exception: %s" % e)
         else:
             # TODO: add the name or something
             logger.info("Added the episode to anidb")
@@ -292,7 +292,7 @@ class Episode(aniDBabstractObject):
         try:
             self.aniDB.mylistdel(size=self.size, ed2k=self.ed2k)
         except Exception as e:
-            logger.exception("Exception: %s", e)
+            logger.exception("Exception: %s" % e)
         else:
             logger.info("Deleted the episode from anidb")
 

lib/adba/aniDBfileInfo.py

@@ -27,7 +27,7 @@ import time
 import xml.etree.cElementTree as etree
 
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('adba')
 logger.addHandler(logging.NullHandler())
 
 
@@ -140,7 +140,7 @@ def _remove_file_failed(file):
     try:
         os.remove(file)
     except OSError:
-        logger.warning("Error occurred while trying to remove file %s", file)
+        logger.warning("Error occurred while trying to remove file %s" % file)
 
 
 def download_file(url, filename):

lib/adba/aniDBlink.py

@@ -26,7 +26,7 @@ from time import time, sleep
 from .aniDBerrors import *
 from .aniDBresponses import ResponseResolver
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('adba')
 logger.addHandler(logging.NullHandler())
 
 
@@ -99,9 +99,9 @@ class AniDBLink(threading.Thread):
                 self._handle_timeouts()
                 continue
             except OSError as error:
-                logger.exception('Exception: %s', error)
+                logger.exception('Exception: %s' % error)
                 break
-            logger.debug("NetIO < %r", data)
+            logger.debug("NetIO < %r" % data)
             try:
                 for i in range(2):
                     try:
@@ -109,10 +109,10 @@ class AniDBLink(threading.Thread):
                         resp = None
                         if tmp[:2] == b'\x00\x00':
                             tmp = zlib.decompressobj().decompress(tmp[2:])
-                            logger.debug("UnZip | %r", tmp)
+                            logger.debug("UnZip | %r" % tmp)
                         resp = ResponseResolver(tmp)
                     except Exception as e:
-                        logger.exception('Exception: %s', e)
+                        logger.exception('Exception: %s' % e)
                         sys.excepthook(*sys.exc_info())
                         self.crypt = None
                         self.session = None

lib/fuzzywuzzy/process.py

@@ -6,6 +6,9 @@ import heapq
 import logging
 from functools import partial
 
+logger = logging.getLogger(__name__)
+logger.addHandler(logging.NullHandler())
+
 
 default_scorer = fuzz.WRatio
 
@@ -78,9 +81,9 @@ def extractWithoutOrder(query, choices, processor=default_processor, scorer=defa
     processed_query = processor(query)
 
     if len(processed_query) == 0:
-        logging.warning(u"Applied processor reduces input query to empty string, "
-                        "all comparisons will have score 0. "
-                        "[Query: \'{0}\']".format(query))
+        logger.warning(u"Applied processor reduces input query to empty string, "
+                       "all comparisons will have score 0. "
+                       "[Query: \'{0}\']".format(query))
 
     # Don't run full_process twice
     if scorer in [fuzz.WRatio, fuzz.QRatio,

sickbeard/anime.py

@@ -174,7 +174,7 @@ def short_group_names(groups):
                 pass
             if isinstance(adba_result, LoginFirstResponse):
                 break
-            if None is adba_result or not adba_result.hasattr('datalines', None):
+            if None is adba_result or not hasattr(adba_result, 'datalines'):
                 continue
             for line in adba_result.datalines:
                 if line['shortname']:

sickbeard/providers/__init__.py

@@ -17,7 +17,7 @@
 # along with SickGear.  If not, see <http://www.gnu.org/licenses/>.
 
 import importlib
-from os import sys
+import sys
 
 from . import generic, newznab
 from .newznab import NewznabConstants