Move to from builtins import * standard across all py modules

malkavi · Apr 15, 2016 · 646d6ed · 646d6ed
1 parent 8075c81
commit 646d6ed
Show file tree

Hide file tree

Showing 419 changed files with 455 additions and 314 deletions.
diff --git a/dev_tools.py b/dev_tools.py
@@ -1,4 +1,6 @@
-from __future__ import print_function
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
+
 import fileinput
 import os
 import shutil

diff --git a/flexget/__init__.py b/flexget/__init__.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python
-from __future__ import unicode_literals, division, absolute_import, print_function
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 from ._version import __version__
 

diff --git a/flexget/api/__init__.py b/flexget/api/__init__.py
@@ -1,5 +1,5 @@
-from __future__ import absolute_import, division, unicode_literals
-from builtins import str
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import json
 import logging

diff --git a/flexget/api/authentication.py b/flexget/api/authentication.py
@@ -1,4 +1,5 @@
-from __future__ import absolute_import, division, unicode_literals
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import base64
 

diff --git a/flexget/api/schema.py b/flexget/api/schema.py
@@ -1,4 +1,5 @@
-from __future__ import absolute_import, division, unicode_literals
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 from flask import jsonify, request
 from jsonschema import RefResolutionError

diff --git a/flexget/api/server.py b/flexget/api/server.py
@@ -1,5 +1,5 @@
-from __future__ import absolute_import, division, unicode_literals
-from builtins import range, object
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import os
 import json

diff --git a/flexget/api/tasks.py b/flexget/api/tasks.py
@@ -1,5 +1,5 @@
-from __future__ import absolute_import, division, unicode_literals
-from builtins import str
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import argparse
 import cgi

diff --git a/flexget/config_schema.py b/flexget/config_schema.py
@@ -1,5 +1,5 @@
-from __future__ import absolute_import, division, unicode_literals
-from builtins import str, map
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 from past.builtins import basestring
 
 from future.moves.urllib.parse import urlparse, parse_qsl

diff --git a/flexget/db_schema.py b/flexget/db_schema.py
@@ -1,4 +1,5 @@
-from __future__ import absolute_import, division, unicode_literals
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 from past.builtins import basestring
 
 import logging

diff --git a/flexget/entry.py b/flexget/entry.py
@@ -1,5 +1,5 @@
-from __future__ import absolute_import, division, unicode_literals
-from builtins import str
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 from past.builtins import str as oldstr
 
 import copy

diff --git a/flexget/event.py b/flexget/event.py
@@ -1,8 +1,8 @@
 """
 Provides small event framework
 """
-from __future__ import absolute_import, division, unicode_literals
-from builtins import object
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import logging
 

diff --git a/flexget/ipc.py b/flexget/ipc.py
@@ -1,5 +1,5 @@
-from __future__ import absolute_import, division, unicode_literals
-from builtins import range, object, str
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import logging
 import random

diff --git a/flexget/logger.py b/flexget/logger.py
@@ -1,5 +1,5 @@
-from __future__ import absolute_import, division, unicode_literals, print_function
-from builtins import str
+from __future__ import unicode_literals, division, absolute_import, print_function
+from builtins import *
 from past.builtins import basestring
 
 import collections

diff --git a/flexget/manager.py b/flexget/manager.py
@@ -1,5 +1,5 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-from builtins import str, object
+from __future__ import unicode_literals, division, absolute_import, print_function
+from builtins import *
 
 import atexit
 import codecs

diff --git a/flexget/options.py b/flexget/options.py
@@ -1,4 +1,5 @@
-from __future__ import absolute_import, division, unicode_literals
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 from past.builtins import basestring
 
 import copy

diff --git a/flexget/plugin.py b/flexget/plugin.py
@@ -1,5 +1,5 @@
-from __future__ import absolute_import, division, unicode_literals
-from builtins import map, str
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 from past.builtins import basestring
 from future.moves.urllib.error import HTTPError, URLError
 

diff --git a/flexget/plugins/api/entry_list.py b/flexget/plugins/api/entry_list.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import copy
 import logging

diff --git a/flexget/plugins/api/history.py b/flexget/plugins/api/history.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import logging
 from math import ceil

diff --git a/flexget/plugins/api/movie_list.py b/flexget/plugins/api/movie_list.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import copy
 import logging

diff --git a/flexget/plugins/api/movie_queue.py b/flexget/plugins/api/movie_queue.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import range
+from builtins import *
 
 import datetime
 from math import ceil

diff --git a/flexget/plugins/api/retry_failed.py b/flexget/plugins/api/retry_failed.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import logging
 

diff --git a/flexget/plugins/api/schedule.py b/flexget/plugins/api/schedule.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import range
+from builtins import *
 
 import copy
 

diff --git a/flexget/plugins/api/seen.py b/flexget/plugins/api/seen.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 from future.moves.urllib.parse import unquote
 
 import copy

diff --git a/flexget/plugins/api/series.py b/flexget/plugins/api/series.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import copy
 import datetime

diff --git a/flexget/plugins/api/tvdb_lookup.py b/flexget/plugins/api/tvdb_lookup.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 from flask import jsonify
 

diff --git a/flexget/plugins/api/tvmaze_lookup.py b/flexget/plugins/api/tvmaze_lookup.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 from flask import jsonify
 from flask_restplus import inputs

diff --git a/flexget/plugins/api/user.py b/flexget/plugins/api/user.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 from flask import request
 from flask.ext.login import current_user

diff --git a/flexget/plugins/api_rottentomatoes.py b/flexget/plugins/api_rottentomatoes.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import str, object
+from builtins import *
 from past.builtins import basestring
 from future.moves.urllib.parse import quote_plus
 from future.moves.urllib.error import URLError

diff --git a/flexget/plugins/api_t411.py b/flexget/plugins/api_t411.py
@@ -1,8 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import next
-from builtins import map
-from builtins import str
-from builtins import object
+from builtins import *
 from datetime import datetime
 from functools import partial
 import json

diff --git a/flexget/plugins/api_tmdb.py b/flexget/plugins/api_tmdb.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import logging
 from datetime import datetime, timedelta

diff --git a/flexget/plugins/api_trakt.py b/flexget/plugins/api_trakt.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import map, str, object
+from builtins import *
 from past.builtins import basestring
 
 import logging

diff --git a/flexget/plugins/api_tvdb.py b/flexget/plugins/api_tvdb.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import object
+from builtins import *
 
 import logging
 from datetime import datetime, timedelta

diff --git a/flexget/plugins/api_tvmaze.py b/flexget/plugins/api_tvmaze.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import object
+from builtins import *
 
 import logging
 from datetime import datetime

diff --git a/flexget/plugins/cli/backlog.py b/flexget/plugins/cli/backlog.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 from flexget import options
 from flexget.event import event

diff --git a/flexget/plugins/cli/check.py b/flexget/plugins/cli/check.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import str
+from builtins import *
 
 import codecs
 import logging

diff --git a/flexget/plugins/cli/cli_config.py b/flexget/plugins/cli/cli_config.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import map
+from builtins import *
 from past.builtins import basestring
 
 import argparse

diff --git a/flexget/plugins/cli/database.py b/flexget/plugins/cli/database.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 from flexget import options
 from flexget.db_schema import reset_schema, plugin_schemas

diff --git a/flexget/plugins/cli/doc.py b/flexget/plugins/cli/doc.py
@@ -1,4 +1,5 @@
-from __future__ import unicode_literals, division, absolute_import, print_function
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import logging
 import sys

diff --git a/flexget/plugins/cli/explain_sql.py b/flexget/plugins/cli/explain_sql.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import str
+from builtins import *
 
 import logging
 from time import time

diff --git a/flexget/plugins/cli/inject.py b/flexget/plugins/cli/inject.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import argparse
 import cgi

diff --git a/flexget/plugins/cli/movie_list.py b/flexget/plugins/cli/movie_list.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 from argparse import ArgumentParser
 

diff --git a/flexget/plugins/cli/movie_queue.py b/flexget/plugins/cli/movie_queue.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 from argparse import ArgumentParser
 

diff --git a/flexget/plugins/cli/perf_tests.py b/flexget/plugins/cli/perf_tests.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import logging
 

diff --git a/flexget/plugins/cli/performance.py b/flexget/plugins/cli/performance.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 import logging
 import time
 

diff --git a/flexget/plugins/cli/plugins.py b/flexget/plugins/cli/plugins.py
@@ -1,4 +1,5 @@
-from __future__ import unicode_literals, division, absolute_import, print_function
+from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import logging
 

diff --git a/flexget/plugins/cli/seen.py b/flexget/plugins/cli/seen.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 from flexget import options
 from flexget.event import event

diff --git a/flexget/plugins/cli/series.py b/flexget/plugins/cli/series.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import str
+from builtins import *
 
 import argparse
 from datetime import datetime, timedelta

diff --git a/flexget/plugins/cli/t411.py b/flexget/plugins/cli/t411.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 from flexget import options, plugin
 from flexget.event import event

diff --git a/flexget/plugins/cli/web.py b/flexget/plugins/cli/web.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 from flexget import options
 from flexget.event import event

diff --git a/flexget/plugins/cli/win32_service.py b/flexget/plugins/cli/win32_service.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import argparse
 import logging

diff --git a/flexget/plugins/daemon/scheduler.py b/flexget/plugins/daemon/scheduler.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import hashlib
 import logging

diff --git a/flexget/plugins/daemon/webui.py b/flexget/plugins/daemon/webui.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import logging
 

diff --git a/flexget/plugins/estimators/est_release_series_internal_db.py b/flexget/plugins/estimators/est_release_series_internal_db.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import object
+from builtins import *
 
 from datetime import timedelta
 import logging

diff --git a/flexget/plugins/estimators/est_release_series_tvmaze.py b/flexget/plugins/estimators/est_release_series_tvmaze.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
-from builtins import object
 
 import logging
 

diff --git a/flexget/plugins/estimators/est_released.py b/flexget/plugins/estimators/est_released.py
@@ -1,4 +1,3 @@
-from builtins import object
 
 import logging
 

diff --git a/flexget/plugins/estimators/est_released_movies.py b/flexget/plugins/estimators/est_released_movies.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import object
+from builtins import *
 
 from datetime import datetime
 import logging

diff --git a/flexget/plugins/filter/accept_all.py b/flexget/plugins/filter/accept_all.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
-from builtins import object
+from builtins import *
 
 import logging
 

diff --git a/flexget/plugins/filter/age.py b/flexget/plugins/filter/age.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals, division, absolute_import
+from builtins import *
 
 import logging
 from datetime import datetime
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		from builtins import object

		import logging

Expand Down