Change remove redundant py2 import futures.

This commit is contained in:
JackDandy 2023-04-22 08:16:49 +01:00
parent 55da3fe6fc
commit fb6ef08f01
57 changed files with 3 additions and 98 deletions

View file

@ -11,6 +11,7 @@
* Update SimpleJSON 3.18.1 (c891b95) to 3.19.1 (aeb63ee) * Update SimpleJSON 3.18.1 (c891b95) to 3.19.1 (aeb63ee)
* Update Tornado Web Server 6.3.0 (7186b86) to 6.3.1 (419838b) * Update Tornado Web Server 6.3.0 (7186b86) to 6.3.1 (419838b)
* Update urllib3 1.26.14 (a06c05c) to 1.26.15 (25cca389) * Update urllib3 1.26.14 (a06c05c) to 1.26.15 (25cca389)
* Change remove redundant py2 import futures
* Change add jobs to centralise scheduler activities * Change add jobs to centralise scheduler activities
* Change refactor scene_exceptions * Change refactor scene_exceptions
* Add config to change media process log message if there is no media to process * Add config to change media process log message if there is no media to process

View file

@ -15,7 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
from time import sleep from time import sleep
import runpy import runpy
print( print(

View file

@ -1,7 +1,6 @@
# encoding:utf-8 # encoding:utf-8
# author:Prinz23 # author:Prinz23
# project:tmdb_api # project:tmdb_api
from __future__ import division
__author__ = 'Prinz23' __author__ = 'Prinz23'
__version__ = '1.0' __version__ = '1.0'

View file

@ -5,7 +5,6 @@
# repository:http://github.com/dbr/tvdb_api # repository:http://github.com/dbr/tvdb_api
# license:un license (http://unlicense.org/) # license:un license (http://unlicense.org/)
from __future__ import absolute_import
from functools import wraps from functools import wraps
__author__ = 'dbr/Ben' __author__ = 'dbr/Ben'

View file

@ -9,7 +9,6 @@
urllib2 caching handler urllib2 caching handler
Modified from http://code.activestate.com/recipes/491261/ Modified from http://code.activestate.com/recipes/491261/
""" """
from __future__ import with_statement
__author__ = "dbr/Ben" __author__ = "dbr/Ben"
__version__ = "1.9" __version__ = "1.9"

View file

@ -2,7 +2,6 @@
# --------------- # ---------------
# functions are placed here to remove cyclic import issues from placement in helpers # functions are placed here to remove cyclic import issues from placement in helpers
# #
from __future__ import division
import ast import ast
import codecs import codecs
import datetime import datetime

View file

@ -10,7 +10,6 @@ Usage::
Expecting property name: line 1 column 2 (char 2) Expecting property name: line 1 column 2 (char 2)
""" """
from __future__ import with_statement
import sys import sys
import simplejson as json import simplejson as json

View file

@ -16,9 +16,6 @@
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
# Check needed software dependencies to nudge users to fix their setup # Check needed software dependencies to nudge users to fix their setup
from __future__ import print_function
from __future__ import with_statement
import codecs import codecs
import datetime import datetime
import errno import errno

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
from collections import OrderedDict from collections import OrderedDict
from threading import Lock from threading import Lock

View file

@ -13,8 +13,6 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division
from functools import reduce from functools import reduce
import operator import operator
import os.path import os.path

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import datetime import datetime
import itertools import itertools
import os.path import os.path

View file

@ -14,8 +14,6 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
from __future__ import with_statement
import exceptions_helper import exceptions_helper
import sickgear import sickgear

View file

@ -15,10 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division
from __future__ import print_function
from __future__ import with_statement
from itertools import cycle from itertools import cycle
import datetime import datetime
import hashlib import hashlib

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import codecs import codecs
import datetime import datetime
import logging import logging

View file

@ -14,7 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
from collections import OrderedDict from collections import OrderedDict
import datetime import datetime

View file

@ -13,8 +13,6 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import absolute_import
import datetime import datetime
import io import io
import os import os

View file

@ -13,8 +13,6 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import absolute_import
import datetime import datetime
from . import mediabrowser from . import mediabrowser

View file

@ -13,8 +13,6 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import absolute_import
import datetime import datetime
import os import os
import re import re

View file

@ -15,8 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement, absolute_import
import datetime import datetime
import os import os

View file

@ -13,7 +13,6 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import absolute_import
import datetime import datetime
import os import os

View file

@ -13,7 +13,6 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import absolute_import
import os import os

View file

@ -13,7 +13,6 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import absolute_import
import datetime import datetime

View file

@ -15,8 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement, division
import datetime import datetime
import os import os
import os.path import os.path

View file

@ -14,7 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
import re import re
from .generic import Notifier, notify_strings from .generic import Notifier, notify_strings

View file

@ -14,7 +14,6 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import absolute_import
import os import os
import re import re

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import os import os
import re import re

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import traceback import traceback
# noinspection PyPep8Naming # noinspection PyPep8Naming

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import glob import glob
import os import os
import re import re

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
from functools import partial from functools import partial
import datetime import datetime
import os import os

View file

@ -15,8 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division
import math import math
import random import random
import re import re

View file

@ -15,8 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement, division
from base64 import b64decode from base64 import b64decode
import codecs import codecs
import datetime import datetime

View file

@ -14,7 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division
# from collections import OrderedDict # from collections import OrderedDict
from io import BytesIO from io import BytesIO
from math import ceil from math import ceil

View file

@ -15,8 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement, division
import re import re
import traceback import traceback

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division
import datetime import datetime
import time import time
import threading import threading

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import datetime import datetime
import os import os
import re import re

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement, division
import datetime import datetime
from math import ceil from math import ceil

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import sickgear import sickgear
from .scheduler import Job from .scheduler import Job

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import copy import copy
import datetime import datetime
import re import re

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import sickgear import sickgear
from .scheduler import Job from .scheduler import Job

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import datetime import datetime
import os import os
import traceback import traceback

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import random import random
import weakref import weakref
from collections import Counter, OrderedDict from collections import Counter, OrderedDict

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import datetime import datetime
import itertools import itertools
import time import time

View file

@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
from . import logger, generic_queue from . import logger, generic_queue
from .webserve import History from .webserve import History

View file

@ -16,8 +16,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
# noinspection PyProtectedMember # noinspection PyProtectedMember
from mimetypes import MimeTypes from mimetypes import MimeTypes
from random import randint from random import randint

View file

@ -15,8 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement, division
# noinspection PyProtectedMember # noinspection PyProtectedMember
from mimetypes import MimeTypes from mimetypes import MimeTypes
from urllib.parse import urljoin from urllib.parse import urljoin

View file

@ -17,7 +17,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
if '__main__' == __name__: if '__main__' == __name__:
import warnings import warnings
warnings.filterwarnings('ignore', module=r'.*fuz.*', message='.*Sequence.*') warnings.filterwarnings('ignore', module=r'.*fuz.*', message='.*Sequence.*')

View file

@ -16,7 +16,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
import unittest import unittest
import test_lib as test import test_lib as test
from sickgear import cache_db, mainDB, failed_db from sickgear import cache_db, mainDB, failed_db

View file

@ -1,5 +1,3 @@
from __future__ import print_function
import gc import gc
import sys import sys
import os.path import os.path

View file

@ -1,4 +1,3 @@
from __future__ import print_function
import datetime import datetime
import os.path import os.path
import test_lib as test import test_lib as test

View file

@ -1,5 +1,4 @@
# coding=utf-8 # coding=utf-8
from __future__ import print_function
import warnings import warnings
warnings.filterwarnings('ignore', module=r'.*fuz.*', message='.*Sequence.*') warnings.filterwarnings('ignore', module=r'.*fuz.*', message='.*Sequence.*')
warnings.filterwarnings('ignore', module=r'.*dateutil.*', message='.*Unicode.*') warnings.filterwarnings('ignore', module=r'.*dateutil.*', message='.*Unicode.*')

View file

@ -16,7 +16,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
import warnings import warnings
warnings.filterwarnings('ignore', module=r'.*fuz.*', message='.*Sequence.*') warnings.filterwarnings('ignore', module=r'.*fuz.*', message='.*Sequence.*')

View file

@ -15,8 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
import datetime import datetime
import unittest import unittest

View file

@ -16,7 +16,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
# import random # import random
import unittest import unittest

View file

@ -16,9 +16,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
from __future__ import with_statement
import gc import gc
import glob import glob
import os.path import os.path

View file

@ -16,7 +16,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
import unittest import unittest
import test_lib as test import test_lib as test
from random import randint from random import randint
@ -208,10 +207,10 @@ find_tests = [
'description': 'simple standard search via main id dict'}, 'description': 'simple standard search via main id dict'},
{'para': {'show_id': {TVINFO_TVDB: 12345}}, 'result': None, {'para': {'show_id': {TVINFO_TVDB: 12345}}, 'result': None,
'description': 'simple standard search via main id dict, for non-existing show'}, 'description': 'simple standard search via main id dict, for non-existing show'},
{'para': {'show_id': {TVINFO_TVDB: 123, TVINFO_TVMAZE: 123}, 'check_multishow': True}, {'para': {'show_id': {TVINFO_TVDB: 123, TVINFO_TVMAZE: 123}, 'check_multishow': True},
'result': {'success': False}, 'result': {'success': False},
'description': 'search via 2 ids matching multiple shows and multi show check'}, 'description': 'search via 2 ids matching multiple shows and multi show check'},
{'para': {'show_id': {TVINFO_TVDB: 5555, TVINFO_TVMAZE: 123}, 'check_multishow': True}, {'para': {'show_id': {TVINFO_TVDB: 5555, TVINFO_TVMAZE: 123}, 'check_multishow': True},
'result': {'tvid': TVINFO_TVMAZE, 'prodid': 123}, 'result': {'tvid': TVINFO_TVMAZE, 'prodid': 123},
'description': 'search via 2 ids matching only 1 show and multi show check'}, 'description': 'search via 2 ids matching only 1 show and multi show check'},
{'para': {'show_id': {TVINFO_TVDB: 123, TVINFO_TVMAZE: 123}}, {'para': {'show_id': {TVINFO_TVDB: 123, TVINFO_TVMAZE: 123}},

View file

@ -16,7 +16,6 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
import datetime import datetime
import itertools import itertools
import os import os

View file

@ -16,9 +16,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
from __future__ import with_statement
import os.path import os.path
import re import re
import sys import sys