diff --git a/sickgear.py b/sickgear.py index 535f95e5..3f36de17 100755 --- a/sickgear.py +++ b/sickgear.py @@ -41,7 +41,7 @@ warnings.filterwarnings('ignore', message='.*deprecated in cryptography.*') versions = [((3, 7, 1), (3, 8, 16)), ((3, 9, 0), (3, 9, 2)), ((3, 9, 4), (3, 9, 16)), - ((3, 10, 0), (3, 11, 2))] # inclusive version ranges + ((3, 10, 0), (3, 11, 3))] # inclusive version ranges if not any(list(map(lambda v: v[0] <= sys.version_info[:3] <= v[1], versions))) and not int(os.environ.get('PYT', 0)): print('Python %s.%s.%s detected.' % sys.version_info[:3]) print('Sorry, SickGear requires a Python version %s' % ', '.join(map( diff --git a/sickgear/tv.py b/sickgear/tv.py index 8e97e111..94cbf772 100644 --- a/sickgear/tv.py +++ b/sickgear/tv.py @@ -2603,7 +2603,7 @@ class TVShow(TVShowBase): if len(sql_result): logger.log('%s: Loading show info%s from database' % vals) raise exceptions_helper.MultipleDBShowsException() - logger.log('%s-%s: Unable to find the show%s in the database' % (self.tvid, self.prodid, self.name)) + logger.log(f'{self.tvid_prodid}: Unable to find the show{self.name} in the database') return show_result = next(iter(sql_result)) diff --git a/sickgear/webserve.py b/sickgear/webserve.py index ff2475cc..1bb406be 100644 --- a/sickgear/webserve.py +++ b/sickgear/webserve.py @@ -8475,7 +8475,6 @@ class ConfigMediaProcess(Config): return t.respond() def save_post_processing(self, tv_download_dir=None, process_automatically=None, mediaprocess_interval=None, - autopostprocesser_frequency=None, unpack=None, keep_processed_dir=None, process_method=None, extra_scripts='', sg_extra_scripts='', rename_episodes=None, airdate_episodes=None, @@ -8487,11 +8486,8 @@ class ConfigMediaProcess(Config): wdtv_data=None, tivo_data=None, mede8er_data=None, kodi_data=None, naming_pattern=None, naming_multi_ep=None, naming_anime=None, naming_anime_pattern=None, naming_anime_multi_ep=None, - naming_abd_pattern=None, naming_sports_pattern=None): - - # prevent deprecated var issues from existing ui, delete in future, added 2020.11.07 - if None is mediaprocess_interval and None is not autopostprocesser_frequency: - mediaprocess_interval = autopostprocesser_frequency + naming_abd_pattern=None, naming_sports_pattern=None, + **kwargs): # kwargs picks up deprecated vars sent from legacy UIs results = []