Merge pull request #1606 from clinton-hall/flake8/future-import

Flake8/future import

TorrentToMedia.py

@@ -1,6 +1,13 @@
 #!/usr/bin/env python
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import datetime
 import os
 import sys

cleanup.py

@@ -1,6 +1,11 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
 
 import os
 import subprocess

core/__init__.py

@@ -1,6 +1,11 @@
 # coding=utf-8
 
-from __future__ import print_function
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
 
 import itertools
 import locale

core/auto_process/books.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import requests
 
 import core

core/auto_process/comics.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 
 import requests

core/auto_process/common.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import requests
 
 from core import logger

core/auto_process/games.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 import shutil
 

core/auto_process/movies.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import json
 import os
 import time

core/auto_process/music.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import json
 import os
 import time

core/auto_process/tv.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import copy
 import errno
 import json

core/configuration.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import copy
 import os
 import shutil

core/databases.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 from core import logger, main_db
 from core.utils import backup_versioned_file
 

core/extractor/__init__.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 import platform
 import shutil

core/forks.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import requests
 from six import iteritems
 

core/github_api.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import requests
 
 

core/logger.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import logging
 import os
 import sys

core/main_db.py

@@ -1,6 +1,11 @@
 # coding=utf-8
 
-from __future__ import print_function
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
 
 import re
 import sqlite3

core/plugins/downloaders/nzb/configuration.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import core
 
 

core/plugins/downloaders/nzb/utils.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 
 import requests

core/plugins/downloaders/torrent/configuration.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import core
 from core.plugins.downloaders.torrent.utils import create_torrent_class
 

core/plugins/downloaders/torrent/deluge.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 from synchronousdeluge.client import DelugeClient
 
 import core

core/plugins/downloaders/torrent/qbittorrent.py

@@ -1,4 +1,10 @@
-from __future__ import absolute_import
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 
 from qbittorrent import Client as qBittorrentClient
 

core/plugins/downloaders/torrent/transmission.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 from transmissionrpc.client import Client as TransmissionClient
 
 import core

core/plugins/downloaders/torrent/utils.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import time
 
 import core

core/plugins/downloaders/torrent/utorrent.py

@@ -1,4 +1,9 @@
-from __future__ import absolute_import
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
 
 from utorrent.client import UTorrentClient
 

core/plugins/plex.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import requests
 
 import core

core/plugins/subtitles.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 from babelfish import Language
 import subliminal
 

core/scene_exceptions.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 import platform
 import re

core/transcoder.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import errno
 import json
 import os

core/user_scripts.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 from subprocess import Popen
 

core/utils/__init__.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import requests
 
 from core.utils import shutil_custom

core/utils/common.py

@@ -1,3 +1,9 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
 
 import os.path
 

core/utils/download_info.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import datetime
 
 from six import text_type

core/utils/encoding.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 
 from six import text_type

core/utils/files.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 import re
 import shutil

core/utils/identification.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 import re
 

core/utils/links.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 import shutil
 

core/utils/naming.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import re
 
 

core/utils/network.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import socket
 import struct
 import time

core/utils/parsers.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 
 import core

core/utils/paths.py

@@ -1,3 +1,9 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
 
 from functools import partial
 import os

core/utils/processes.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 import socket
 import subprocess

core/utils/shutil_custom.py

@@ -1,3 +1,10 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 from functools import partial
 import shutil
 from six import PY2

core/version_check.py

@@ -2,6 +2,13 @@
 # Author: Nic Wolfe <nic@wolfeden.ca>
 # Modified by: echel0n
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 import platform
 import re

eol.py

@@ -1,5 +1,12 @@
 #!/usr/bin/env python
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import datetime
 import sys
 import warnings

libs/__init__.py

@@ -1,4 +1,11 @@
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 import site
 import sys

libs/__main__.py

@@ -1,4 +1,11 @@
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import shutil
 import os
 import time

libs/autoload.py

@@ -1,4 +1,11 @@
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import libs
 
 __all__ = ['completed']

libs/custom/synchronousdeluge/__init__.py

@@ -16,6 +16,13 @@ Example usage:
     download_location = client.core.get_config_value("download_location").get()
 """
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 from .exceptions import DelugeRPCError
 
 

libs/custom/synchronousdeluge/client.py

@@ -1,4 +1,12 @@
 # coding=utf-8
+
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import os
 import platform
 from collections import defaultdict

libs/custom/synchronousdeluge/exceptions.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 
 class DelugeRPCError(Exception):
     def __init__(self, name, msg, traceback):

libs/custom/synchronousdeluge/protocol.py

@@ -1,5 +1,12 @@
 # coding=utf-8
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 
 class DelugeRPCRequest(object):
     def __init__(self, request_id, method, *args, **kwargs):

libs/custom/synchronousdeluge/transfer.py

@@ -1,4 +1,12 @@
 # coding=utf-8
+
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import socket
 import ssl
 import struct

libs/custom/utorrent/client.py

@@ -1,4 +1,12 @@
 # coding=utf8
+
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import re
 
 from six import StringIO, iteritems

libs/custom/utorrent/upload.py

@@ -1,6 +1,13 @@
 # coding=utf-8
 # code copied from http://www.doughellmann.com/PyMOTW/urllib2/
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import itertools
 import mimetypes
 from email.generator import _make_boundary as choose_boundary

libs/util.py

@@ -1,4 +1,11 @@
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import subprocess
 import sys
 import os

nzbToCouchPotato.py

@@ -255,6 +255,13 @@
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
 ##############################################################################
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import sys
 
 import nzbToMedia

nzbToGamez.py

@@ -100,6 +100,13 @@
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
 ##############################################################################
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import sys
 
 import nzbToMedia

nzbToHeadPhones.py

@@ -122,6 +122,13 @@
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
 ##############################################################################
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import sys
 
 import nzbToMedia

nzbToLazyLibrarian.py

@@ -95,6 +95,13 @@
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
 ##############################################################################
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import sys
 
 import nzbToMedia

nzbToLidarr.py

@@ -237,6 +237,13 @@
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
 ##############################################################################
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import sys
 
 import nzbToMedia

nzbToMedia.py

@@ -655,7 +655,12 @@
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
 ##############################################################################
 
-from __future__ import print_function
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
 
 import datetime
 import os

nzbToMylar.py

@@ -113,6 +113,13 @@
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
 ##############################################################################
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import sys
 
 import nzbToMedia

nzbToNzbDrone.py

@@ -242,6 +242,13 @@
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
 ##############################################################################
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import sys
 
 import nzbToMedia

nzbToRadarr.py

@@ -247,6 +247,13 @@
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
 ##############################################################################
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import sys
 
 import nzbToMedia

nzbToSickBeard.py

@@ -256,6 +256,13 @@
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
 ##############################################################################
 
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 import sys
 
 import nzbToMedia

setup.py

@@ -1,6 +1,11 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
-from __future__ import absolute_import, print_function
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
 
 import io
 import os.path

tests/__init__.py

@@ -1 +1,8 @@
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
+
 __author__ = 'Justin'

tests/test_initialize.py

@@ -1,5 +1,10 @@
 #! /usr/bin/env python
-from __future__ import print_function
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
 
 import core
 

tests/test_transcoder.py

@@ -1,5 +1,10 @@
 #! /usr/bin/env python
-from __future__ import print_function
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals,
+)
 
 import core
 from core import transcoder

tox.ini

@@ -34,6 +34,8 @@ max-line-length = 79
 max-doc-length = 79
 verbose = 2
 statistics = True
+min-version = 2.7
+require-code = True
 exclude =
     .github/
     .tox/
@@ -65,6 +67,20 @@ ignore =
 ;    D402 First line should not be the function's "signature"
     D100, D101, D102, D103, D104, D105, D107
 
+;   -- flake8-future-import --
+;    x = 1 for missing, 5 for present
+;    FIx6 nested_scopes     2.2
+;    FIx7 generators        2.3
+;    FIx2 with_statement    2.6
+;    FIx1 absolute_import   3.0
+;    FIx0 division          3.0
+;    FIx3 print_function    3.0
+;    FIx4 unicode_literals  3.0
+;    FIx5 generator_stop    3.7
+;    ???? annotations       4.0
+;    FI90 __future__ import does not exist
+    FI50, FI51, FI53, FI54
+
 per-file-ignores =
 ;    F401 imported but unused
 ;    E402 module level import not at top of file
@@ -83,6 +99,7 @@ deps =
     flake8-commas
     flake8-comprehensions
     flake8-docstrings
+    flake8-future-import
     flake8-quotes
 skip_install = true
 commands =
@@ -102,7 +119,7 @@ commands =
 ;   -- flake8-bugbear --
 ;    B902 Invalid first argument used for instance method.
 ;    B903 Data class should be immutable or use __slots__ to save memory.
-flake8 --select=B902,B903,E123,E226,E241,E242,E704,W504,W505
+    flake8 --select=B902,B903,E123,E226,E241,E242,E704,W504,W505
 
 [coverage:run]
 omit =