Merge branch 'feature/ChangeRemoveFutures' into dev

CHANGES.md

@@ -11,6 +11,7 @@
 * 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 urllib3 1.26.14 (a06c05c) to 1.26.15 (25cca389)
+* Change remove redundant py2 import futures
 * Change add jobs to centralise scheduler activities
 * Change refactor scene_exceptions
 * Add config to change media process log message if there is no media to process

SickBeard.py

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

lib/api_tmdb/tmdb_api.py

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

lib/api_tvdb/tvdb_api.py

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

lib/api_tvdb/tvdb_cache.py

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

lib/sg_helpers.py

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

lib/simplejson/tool.py

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

sickgear.py

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

sickgear/__init__.py

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

sickgear/common.py

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

sickgear/db.py

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

sickgear/failedProcessor.py

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

sickgear/helpers.py

@@ -15,10 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # 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
 import datetime
 import hashlib

sickgear/logger.py

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

sickgear/metadata/generic.py

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

sickgear/metadata/kodi.py

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

sickgear/metadata/mede8er.py

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

sickgear/metadata/mediabrowser.py

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

sickgear/metadata/tivo.py

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

sickgear/metadata/wdtv.py

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

sickgear/metadata/xbmc.py

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

sickgear/metadata/xbmc_12plus.py

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

sickgear/name_parser/parser.py

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

sickgear/notifiers/growl.py

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

sickgear/notifiers/telegram.py

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

sickgear/nzbSplitter.py

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

sickgear/people_queue.py

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

sickgear/postProcessor.py

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

sickgear/processTV.py

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

sickgear/providers/btn.py

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

sickgear/providers/generic.py

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

sickgear/providers/newznab.py

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

sickgear/providers/thepiratebay.py

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

sickgear/scheduler.py

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

sickgear/search.py

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

sickgear/search_backlog.py

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

sickgear/search_propers.py

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

sickgear/search_queue.py

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

sickgear/search_recent.py

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

sickgear/show_queue.py

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

sickgear/tv.py

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

sickgear/tvcache.py

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

sickgear/watchedstate_queue.py

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

sickgear/webapi.py

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

sickgear/webserve.py

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

tests/all_tests.py

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

tests/db_tests.py

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

tests/migration_tests.py

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

tests/name_parser_tests.py

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

tests/newznab_tests.py

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

tests/pp_tests.py

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

tests/show_tests.py

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

tests/snatch_tests.py

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

tests/test_lib.py

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

tests/tv_tests.py

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

tests/webapi_tests.py

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

tests/xem_tests.py

@@ -16,9 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # 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 re
 import sys