jenkins-bot has submitted this change and it was merged.
Change subject: Enforce __future__.absolute_import
......................................................................
Enforce __future__.absolute_import
Change-Id: Ie29d16d94c3e718d796103634edf6fd40de69115
---
M docs/conf.py
M generate_user_files.py
M pwb.py
M pywikibot/__init__.py
M pywikibot/bot_choice.py
M pywikibot/botirc.py
M pywikibot/comms/__init__.py
M pywikibot/comms/http.py
M pywikibot/comms/rcstream.py
M pywikibot/comms/threadedhttp.py
M pywikibot/compat/catlib.py
M pywikibot/compat/query.py
M pywikibot/compat/userlib.py
M pywikibot/config2.py
M pywikibot/cosmetic_changes.py
M pywikibot/daemonize.py
M pywikibot/data/__init__.py
M pywikibot/data/api.py
M pywikibot/data/wikidataquery.py
M pywikibot/data/wikistats.py
M pywikibot/date.py
M pywikibot/diff.py
M pywikibot/echo.py
M pywikibot/editor.py
M pywikibot/exceptions.py
M pywikibot/families/__init__.py
M pywikibot/families/anarchopedia_family.py
M pywikibot/families/battlestarwiki_family.py
M pywikibot/families/commons_family.py
M pywikibot/families/i18n_family.py
M pywikibot/families/incubator_family.py
M pywikibot/families/lyricwiki_family.py
M pywikibot/families/mediawiki_family.py
M pywikibot/families/meta_family.py
M pywikibot/families/omegawiki_family.py
M pywikibot/families/osm_family.py
M pywikibot/families/outreach_family.py
M pywikibot/families/species_family.py
M pywikibot/families/strategy_family.py
M pywikibot/families/test_family.py
M pywikibot/families/vikidia_family.py
M pywikibot/families/wikia_family.py
M pywikibot/families/wikibooks_family.py
M pywikibot/families/wikidata_family.py
M pywikibot/families/wikimediachapter_family.py
M pywikibot/families/wikinews_family.py
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/families/wikisource_family.py
M pywikibot/families/wikitech_family.py
M pywikibot/families/wikiversity_family.py
M pywikibot/families/wikivoyage_family.py
M pywikibot/families/wiktionary_family.py
M pywikibot/families/wowwiki_family.py
M pywikibot/fixes.py
M pywikibot/i18n.py
M pywikibot/interwiki_graph.py
M pywikibot/logentries.py
M pywikibot/login.py
M pywikibot/pagegenerators.py
M pywikibot/plural.py
M pywikibot/proofreadpage.py
M pywikibot/site.py
M pywikibot/site_detect.py
M pywikibot/textlib.py
M pywikibot/throttle.py
M pywikibot/titletranslate.py
M pywikibot/tools/__init__.py
M pywikibot/tools/chars.py
M pywikibot/tools/djvu.py
M pywikibot/tools/ip.py
M pywikibot/userinterfaces/__init__.py
M pywikibot/userinterfaces/cgi_interface.py
M pywikibot/userinterfaces/gui.py
M pywikibot/userinterfaces/terminal_interface.py
M pywikibot/userinterfaces/terminal_interface_unix.py
M pywikibot/userinterfaces/terminal_interface_win32.py
M pywikibot/userinterfaces/transliteration.py
M pywikibot/userinterfaces/win32_unicode.py
M pywikibot/version.py
M pywikibot/weblib.py
M pywikibot/xmlreader.py
M scripts/add_text.py
M scripts/archivebot.py
M scripts/basic.py
M scripts/blockpageschecker.py
M scripts/blockreview.py
M scripts/capitalize_redirects.py
M scripts/casechecker.py
M scripts/catall.py
M scripts/category.py
M scripts/category_redirect.py
M scripts/cfd.py
M scripts/checkimages.py
M scripts/claimit.py
M scripts/clean_sandbox.py
M scripts/commons_link.py
M scripts/commonscat.py
M scripts/coordinate_import.py
M scripts/cosmetic_changes.py
M scripts/create_categories.py
M scripts/data_ingestion.py
M scripts/delete.py
M scripts/disambredir.py
M scripts/djvutext.py
M scripts/editarticle.py
M scripts/featured.py
M scripts/fixing_redirects.py
M scripts/flickrripper.py
M scripts/freebasemappingupload.py
M scripts/harvest_template.py
M scripts/illustrate_wikidata.py
M scripts/image.py
M scripts/imagerecat.py
M scripts/imagetransfer.py
M scripts/imageuncat.py
M scripts/interwiki.py
M scripts/isbn.py
M scripts/listpages.py
M scripts/login.py
M scripts/lonelypages.py
M scripts/maintenance/cache.py
M scripts/maintenance/compat2core.py
M scripts/maintenance/make_i18n_dict.py
M scripts/maintenance/wikimedia_sites.py
M scripts/makecat.py
M scripts/match_images.py
M scripts/misspelling.py
M scripts/movepages.py
M scripts/newitem.py
M scripts/noreferences.py
M scripts/nowcommons.py
M scripts/pagefromfile.py
M scripts/patrol.py
M scripts/piper.py
M scripts/protect.py
M scripts/redirect.py
M scripts/reflinks.py
M scripts/replace.py
M scripts/replicate_wiki.py
M scripts/revertbot.py
M scripts/script_wui.py
M scripts/selflink.py
M scripts/shell.py
M scripts/solve_disambiguation.py
M scripts/spamremove.py
M scripts/states_redirect.py
M scripts/template.py
M scripts/templatecount.py
M scripts/touch.py
M scripts/transferbot.py
M scripts/unlink.py
M scripts/unusedfiles.py
M scripts/upload.py
M scripts/version.py
M scripts/watchlist.py
M scripts/weblinkchecker.py
M scripts/welcome.py
M setup.py
M tests/__init__.py
M tests/api_tests.py
M tests/archivebot_tests.py
M tests/aspects.py
M tests/basepage_tests.py
M tests/bot_tests.py
M tests/cache_tests.py
M tests/category_tests.py
M tests/checkimages_tests.py
M tests/cosmetic_changes_tests.py
M tests/data/fixes.py
M tests/data/set-fixes.py
M tests/data_ingestion_tests.py
M tests/date_tests.py
M tests/deletionbot_tests.py
M tests/deprecation_tests.py
M tests/disambredir_tests.py
M tests/djvu_tests.py
M tests/dry_api_tests.py
M tests/dry_site_tests.py
M tests/edit_failure_tests.py
M tests/edit_tests.py
M tests/exceptions_tests.py
M tests/family_tests.py
M tests/file_tests.py
M tests/fixes_tests.py
M tests/flow_edit_tests.py
M tests/flow_tests.py
M tests/http_tests.py
M tests/i18n/pywikibot.py
M tests/i18n_tests.py
M tests/interwiki_graph_tests.py
M tests/interwiki_link_tests.py
M tests/isbn_tests.py
M tests/l10n_tests.py
M tests/link_tests.py
M tests/logentry_tests.py
M tests/mediawikiversion_tests.py
M tests/namespace_tests.py
M tests/oauth_tests.py
M tests/page_tests.py
M tests/pagegenerators_tests.py
M tests/paraminfo_tests.py
M tests/proofreadpage_tests.py
M tests/protectbot_tests.py
M tests/pwb/print_env.py
M tests/pwb/print_locals.py
M tests/pwb/print_unicode.py
M tests/pwb_tests.py
M tests/python_tests.py
M tests/reflinks_tests.py
M tests/replacebot_tests.py
M tests/script_tests.py
M tests/site_detect_tests.py
M tests/site_tests.py
M tests/tests_tests.py
M tests/textlib_tests.py
M tests/thread_tests.py
M tests/timestamp_tests.py
M tests/timestripper_tests.py
M tests/tk_tests.py
M tests/tools_chars_tests.py
M tests/tools_formatter_tests.py
M tests/tools_ip_tests.py
M tests/tools_tests.py
M tests/ui_options_tests.py
M tests/ui_tests.py
M tests/upload_tests.py
M tests/uploadbot_tests.py
M tests/utils.py
M tests/weblib_tests.py
M tests/weblinkchecker_tests.py
M tests/wikibase_edit_tests.py
M tests/wikibase_tests.py
M tests/wikidataquery_tests.py
M tests/wikistats_tests.py
M tests/xmlreader_tests.py
M tox.ini
237 files changed, 239 insertions(+), 239 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/conf.py b/docs/conf.py
index 917ff79..bfe7162 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -11,7 +11,7 @@
#
# All configuration values have a default; values that are commented out
# serve to show the default.
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import os
import sys
diff --git a/generate_user_files.py b/generate_user_files.py
index 5176b97..a66bc2d 100755
--- a/generate_user_files.py
+++ b/generate_user_files.py
@@ -6,7 +6,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
import codecs
@@ -161,7 +161,7 @@
return fam.name, mylang, username
EXTENDED_CONFIG = u"""# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
# This is an automatically generated file. You can find more configuration
# parameters in 'config.py' file.
@@ -208,7 +208,7 @@
{config_text}"""
SMALL_CONFIG = (u"# -*- coding: utf-8 -*-\n"
- u"from __future__ import unicode_literals\n"
+ u"from __future__ import absolute_import, unicode_literals\n"
u"family = '{main_family}'\n"
u"mylang = '{main_lang}'\n"
u"{usernames}\n")
diff --git a/pwb.py b/pwb.py
index 3266a85..7d8ee4f 100755
--- a/pwb.py
+++ b/pwb.py
@@ -13,7 +13,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
__version__ = '$Id$'
# The following snippet was developed by Ned Batchelder (and others)
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index fc32f30..9d6c7d1 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__release__ = '2.0b3'
__version__ = '$Id$'
diff --git a/pywikibot/bot_choice.py b/pywikibot/bot_choice.py
index 95e2144..17c799d 100755
--- a/pywikibot/bot_choice.py
+++ b/pywikibot/bot_choice.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/botirc.py b/pywikibot/botirc.py
index 77d258a..35e2155 100644
--- a/pywikibot/botirc.py
+++ b/pywikibot/botirc.py
@@ -11,7 +11,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/comms/__init__.py b/pywikibot/comms/__init__.py
index 747d0a7..f34f5e9 100644
--- a/pywikibot/comms/__init__.py
+++ b/pywikibot/comms/__init__.py
@@ -5,6 +5,6 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py
index 835202f..5bccc54 100644
--- a/pywikibot/comms/http.py
+++ b/pywikibot/comms/http.py
@@ -11,7 +11,7 @@
- URL-encoding all data
- Basic HTTP error handling
"""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
#
# (C) Pywikibot team, 2007-2015
diff --git a/pywikibot/comms/rcstream.py b/pywikibot/comms/rcstream.py
index 2cce8ae..f6bc183 100644
--- a/pywikibot/comms/rcstream.py
+++ b/pywikibot/comms/rcstream.py
@@ -9,7 +9,7 @@
This module requires socketIO_client to be installed:
pip install socketIO_client
"""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import sys
import threading
diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py
index 6c6f72a..5075663 100644
--- a/pywikibot/comms/threadedhttp.py
+++ b/pywikibot/comms/threadedhttp.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Http backend layer, formerly providing a httplib2
wrapper."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
# (C) Pywikibot team, 2007-2015
__version__ = '$Id$'
diff --git a/pywikibot/compat/catlib.py b/pywikibot/compat/catlib.py
index fe2aa55..acecd29 100644
--- a/pywikibot/compat/catlib.py
+++ b/pywikibot/compat/catlib.py
@@ -11,7 +11,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/compat/query.py b/pywikibot/compat/query.py
index 13c7059..4fc0033 100644
--- a/pywikibot/compat/query.py
+++ b/pywikibot/compat/query.py
@@ -11,7 +11,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import pywikibot
from pywikibot.data import api
diff --git a/pywikibot/compat/userlib.py b/pywikibot/compat/userlib.py
index 4ff7e78..fe7d17f 100644
--- a/pywikibot/compat/userlib.py
+++ b/pywikibot/compat/userlib.py
@@ -11,7 +11,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index a19def2..ebc2cc7 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -37,7 +37,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py
index e6b5213..8401a0e 100755
--- a/pywikibot/cosmetic_changes.py
+++ b/pywikibot/cosmetic_changes.py
@@ -54,7 +54,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/daemonize.py b/pywikibot/daemonize.py
index b97ce2f..702ae7b 100644
--- a/pywikibot/daemonize.py
+++ b/pywikibot/daemonize.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/data/__init__.py b/pywikibot/data/__init__.py
index 44183c7..5cfbaaa 100644
--- a/pywikibot/data/__init__.py
+++ b/pywikibot/data/__init__.py
@@ -5,6 +5,6 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index e574227..b66fa65 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/data/wikidataquery.py b/pywikibot/data/wikidataquery.py
index 054eb44..da54df2 100644
--- a/pywikibot/data/wikidataquery.py
+++ b/pywikibot/data/wikidataquery.py
@@ -4,7 +4,7 @@
# (C) Pywikibot team, 2013
#
# Distributed under the terms of the MIT license.
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import json
import sys
diff --git a/pywikibot/data/wikistats.py b/pywikibot/data/wikistats.py
index dd445c7..fbf928d 100644
--- a/pywikibot/data/wikistats.py
+++ b/pywikibot/data/wikistats.py
@@ -4,7 +4,7 @@
# (C) Pywikibot team, 2014
#
# Distributed under the terms of the MIT license.
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import sys
diff --git a/pywikibot/date.py b/pywikibot/date.py
index 5c91b34..dd63890 100644
--- a/pywikibot/date.py
+++ b/pywikibot/date.py
@@ -11,7 +11,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import division, unicode_literals
+from __future__ import absolute_import, division, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/diff.py b/pywikibot/diff.py
index b1136b4..1a91ef5 100644
--- a/pywikibot/diff.py
+++ b/pywikibot/diff.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/echo.py b/pywikibot/echo.py
index 311827d..8c9584a 100644
--- a/pywikibot/echo.py
+++ b/pywikibot/echo.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Classes and functions for working with the Echo
extension."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import pywikibot
diff --git a/pywikibot/editor.py b/pywikibot/editor.py
index f734bda..4ccf779 100644
--- a/pywikibot/editor.py
+++ b/pywikibot/editor.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
"""Text editor class for your favourite editor."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
#
# (C) Gerrit Holl, 2004
diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py
index 4422660..64b27d0 100644
--- a/pywikibot/exceptions.py
+++ b/pywikibot/exceptions.py
@@ -78,7 +78,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/__init__.py b/pywikibot/families/__init__.py
index ccb2305..ef884ae 100644
--- a/pywikibot/families/__init__.py
+++ b/pywikibot/families/__init__.py
@@ -5,6 +5,6 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/anarchopedia_family.py
b/pywikibot/families/anarchopedia_family.py
index 06a1eee..07ce1e2 100644
--- a/pywikibot/families/anarchopedia_family.py
+++ b/pywikibot/families/anarchopedia_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Anarchopedia wiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/battlestarwiki_family.py
b/pywikibot/families/battlestarwiki_family.py
index a7817cc..685d7b1 100644
--- a/pywikibot/families/battlestarwiki_family.py
+++ b/pywikibot/families/battlestarwiki_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Battlestar Wiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/commons_family.py b/pywikibot/families/commons_family.py
index d2edb13..c23ce91 100644
--- a/pywikibot/families/commons_family.py
+++ b/pywikibot/families/commons_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikimedia Commons."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/i18n_family.py b/pywikibot/families/i18n_family.py
index 69ba58c..6647623 100644
--- a/pywikibot/families/i18n_family.py
+++ b/pywikibot/families/i18n_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Translate Wiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/incubator_family.py
b/pywikibot/families/incubator_family.py
index 6ed72d3..493ef9b 100644
--- a/pywikibot/families/incubator_family.py
+++ b/pywikibot/families/incubator_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Incubator Wiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/lyricwiki_family.py
b/pywikibot/families/lyricwiki_family.py
index 21a2df1..9483c65 100644
--- a/pywikibot/families/lyricwiki_family.py
+++ b/pywikibot/families/lyricwiki_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for LyricWiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/mediawiki_family.py
b/pywikibot/families/mediawiki_family.py
index a941483..069634d 100644
--- a/pywikibot/families/mediawiki_family.py
+++ b/pywikibot/families/mediawiki_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for MediaWiki wiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/meta_family.py b/pywikibot/families/meta_family.py
index b24603a..f59c79b 100644
--- a/pywikibot/families/meta_family.py
+++ b/pywikibot/families/meta_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Meta Wiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/omegawiki_family.py
b/pywikibot/families/omegawiki_family.py
index 6fe9a0b..a0a6f54 100644
--- a/pywikibot/families/omegawiki_family.py
+++ b/pywikibot/families/omegawiki_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Omega Wiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/osm_family.py b/pywikibot/families/osm_family.py
index d8d5f38..e2311ee 100644
--- a/pywikibot/families/osm_family.py
+++ b/pywikibot/families/osm_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for OpenStreetMap wiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/outreach_family.py
b/pywikibot/families/outreach_family.py
index 36ae961..412a273 100644
--- a/pywikibot/families/outreach_family.py
+++ b/pywikibot/families/outreach_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikimedia outreach wiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/species_family.py b/pywikibot/families/species_family.py
index 02d46fa..204b39a 100644
--- a/pywikibot/families/species_family.py
+++ b/pywikibot/families/species_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikimedia species wiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/strategy_family.py
b/pywikibot/families/strategy_family.py
index b5e9ed9..925254f 100644
--- a/pywikibot/families/strategy_family.py
+++ b/pywikibot/families/strategy_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikimedia Strategy Wiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/test_family.py b/pywikibot/families/test_family.py
index 4a80e7d..8f8815c 100644
--- a/pywikibot/families/test_family.py
+++ b/pywikibot/families/test_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for test.wikipedia.org."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/vikidia_family.py b/pywikibot/families/vikidia_family.py
index 07b04ac..5a79642 100644
--- a/pywikibot/families/vikidia_family.py
+++ b/pywikibot/families/vikidia_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Vikidia."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/wikia_family.py b/pywikibot/families/wikia_family.py
index 8cf904b..7f58539 100644
--- a/pywikibot/families/wikia_family.py
+++ b/pywikibot/families/wikia_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikia."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/wikibooks_family.py
b/pywikibot/families/wikibooks_family.py
index 93a1413..91b5a21 100644
--- a/pywikibot/families/wikibooks_family.py
+++ b/pywikibot/families/wikibooks_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikibooks."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
from pywikibot import family
diff --git a/pywikibot/families/wikidata_family.py
b/pywikibot/families/wikidata_family.py
index 847d655..b7a2786 100644
--- a/pywikibot/families/wikidata_family.py
+++ b/pywikibot/families/wikidata_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikidata."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/wikimediachapter_family.py
b/pywikibot/families/wikimediachapter_family.py
index f8f60aa..a6a515a 100644
--- a/pywikibot/families/wikimediachapter_family.py
+++ b/pywikibot/families/wikimediachapter_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikimedia chapter wikis."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/wikinews_family.py
b/pywikibot/families/wikinews_family.py
index 914316d..ac83ae7 100644
--- a/pywikibot/families/wikinews_family.py
+++ b/pywikibot/families/wikinews_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikinews."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
from pywikibot import family
diff --git a/pywikibot/families/wikipedia_family.py
b/pywikibot/families/wikipedia_family.py
index b7c4815..674b046 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikipedia."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
from pywikibot import family
diff --git a/pywikibot/families/wikiquote_family.py
b/pywikibot/families/wikiquote_family.py
index 3d42cef..0c9f5d5 100644
--- a/pywikibot/families/wikiquote_family.py
+++ b/pywikibot/families/wikiquote_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikiquote."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
from pywikibot import family
diff --git a/pywikibot/families/wikisource_family.py
b/pywikibot/families/wikisource_family.py
index d1d37b2..72a3a07 100644
--- a/pywikibot/families/wikisource_family.py
+++ b/pywikibot/families/wikisource_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikisource."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
from pywikibot import family
diff --git a/pywikibot/families/wikitech_family.py
b/pywikibot/families/wikitech_family.py
index de6fa58..f21ba2b 100644
--- a/pywikibot/families/wikitech_family.py
+++ b/pywikibot/families/wikitech_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikitech."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/wikiversity_family.py
b/pywikibot/families/wikiversity_family.py
index bd0504f..5ae4022 100644
--- a/pywikibot/families/wikiversity_family.py
+++ b/pywikibot/families/wikiversity_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikiversity."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
from pywikibot import family
diff --git a/pywikibot/families/wikivoyage_family.py
b/pywikibot/families/wikivoyage_family.py
index bd0b8cd..f762c76 100644
--- a/pywikibot/families/wikivoyage_family.py
+++ b/pywikibot/families/wikivoyage_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wikivoyage."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/families/wiktionary_family.py
b/pywikibot/families/wiktionary_family.py
index 85df406..8b13ae0 100644
--- a/pywikibot/families/wiktionary_family.py
+++ b/pywikibot/families/wiktionary_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for Wiktionary."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
from pywikibot import family
diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py
index 75d2117..b78c543 100644
--- a/pywikibot/families/wowwiki_family.py
+++ b/pywikibot/families/wowwiki_family.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Family module for WOW Wiki."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py
index 568863e..b6049b2 100644
--- a/pywikibot/fixes.py
+++ b/pywikibot/fixes.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import os.path
diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index 0a2a5d2..4a7d5d0 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -21,7 +21,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py
index 223307d..536e647 100644
--- a/pywikibot/interwiki_graph.py
+++ b/pywikibot/interwiki_graph.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py
index 11f1d73..452bf9d 100644
--- a/pywikibot/logentries.py
+++ b/pywikibot/logentries.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/login.py b/pywikibot/login.py
index de84d9e..af995fc 100644
--- a/pywikibot/login.py
+++ b/pywikibot/login.py
@@ -7,7 +7,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index e45386b..d68b883 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -18,7 +18,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/plural.py b/pywikibot/plural.py
index c9edb6b..ddb6ce1 100644
--- a/pywikibot/plural.py
+++ b/pywikibot/plural.py
@@ -6,7 +6,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py
index 0db0332..0703b89 100644
--- a/pywikibot/proofreadpage.py
+++ b/pywikibot/proofreadpage.py
@@ -14,7 +14,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/site.py b/pywikibot/site.py
index a82da93..9aaceed 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -10,7 +10,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py
index 16aace9..8ad1f24 100644
--- a/pywikibot/site_detect.py
+++ b/pywikibot/site_detect.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 72d68b6..18b9d7d 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -11,7 +11,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/throttle.py b/pywikibot/throttle.py
index 4157254..83e9f7e 100644
--- a/pywikibot/throttle.py
+++ b/pywikibot/throttle.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/titletranslate.py b/pywikibot/titletranslate.py
index c535815..790e17e 100644
--- a/pywikibot/titletranslate.py
+++ b/pywikibot/titletranslate.py
@@ -7,7 +7,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index 2787b89..8f2c918 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
__version__ = '$Id$'
import bz2
diff --git a/pywikibot/tools/chars.py b/pywikibot/tools/chars.py
index f0e88b1..7be5b7c 100644
--- a/pywikibot/tools/chars.py
+++ b/pywikibot/tools/chars.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/tools/djvu.py b/pywikibot/tools/djvu.py
index f22b89a..6fb23cc 100644
--- a/pywikibot/tools/djvu.py
+++ b/pywikibot/tools/djvu.py
@@ -6,7 +6,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/tools/ip.py b/pywikibot/tools/ip.py
index e1071ca..dca6ef8 100644
--- a/pywikibot/tools/ip.py
+++ b/pywikibot/tools/ip.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/userinterfaces/__init__.py b/pywikibot/userinterfaces/__init__.py
index 43eceeb..5f9e6ac 100644
--- a/pywikibot/userinterfaces/__init__.py
+++ b/pywikibot/userinterfaces/__init__.py
@@ -5,6 +5,6 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/userinterfaces/cgi_interface.py
b/pywikibot/userinterfaces/cgi_interface.py
index 3c83914..5575b73 100644
--- a/pywikibot/userinterfaces/cgi_interface.py
+++ b/pywikibot/userinterfaces/cgi_interface.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""CGI user interface."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import sys
diff --git a/pywikibot/userinterfaces/gui.py b/pywikibot/userinterfaces/gui.py
index 59faacf..03a49d6 100644
--- a/pywikibot/userinterfaces/gui.py
+++ b/pywikibot/userinterfaces/gui.py
@@ -4,7 +4,7 @@
Useful for editing the contents of an article.
"""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
#
# (C) Rob W.W. Hooft, 2003
diff --git a/pywikibot/userinterfaces/terminal_interface.py
b/pywikibot/userinterfaces/terminal_interface.py
index 985996b..428bdeb 100644
--- a/pywikibot/userinterfaces/terminal_interface.py
+++ b/pywikibot/userinterfaces/terminal_interface.py
@@ -9,7 +9,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/userinterfaces/terminal_interface_unix.py
b/pywikibot/userinterfaces/terminal_interface_unix.py
index 43d2933..f9ba31e 100755
--- a/pywikibot/userinterfaces/terminal_interface_unix.py
+++ b/pywikibot/userinterfaces/terminal_interface_unix.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/userinterfaces/terminal_interface_win32.py
b/pywikibot/userinterfaces/terminal_interface_win32.py
index 13cef1a..2c3107b 100755
--- a/pywikibot/userinterfaces/terminal_interface_win32.py
+++ b/pywikibot/userinterfaces/terminal_interface_win32.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/userinterfaces/transliteration.py
b/pywikibot/userinterfaces/transliteration.py
index 49e0d1f..1c6f6d0 100644
--- a/pywikibot/userinterfaces/transliteration.py
+++ b/pywikibot/userinterfaces/transliteration.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Module to transliterate text."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/userinterfaces/win32_unicode.py
b/pywikibot/userinterfaces/win32_unicode.py
index 733f4dd..63af993 100755
--- a/pywikibot/userinterfaces/win32_unicode.py
+++ b/pywikibot/userinterfaces/win32_unicode.py
@@ -20,7 +20,7 @@
# Licensed under both CC-BY-SA and the MIT license.
#
################################################
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
from io import UnsupportedOperation
import sys
stdin = sys.stdin
diff --git a/pywikibot/version.py b/pywikibot/version.py
index 7b2f833..7f5c64d 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -7,7 +7,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/pywikibot/weblib.py b/pywikibot/weblib.py
index 44f8ffb..60f99e1 100644
--- a/pywikibot/weblib.py
+++ b/pywikibot/weblib.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py
index 0846acd..14e4647 100644
--- a/pywikibot/xmlreader.py
+++ b/pywikibot/xmlreader.py
@@ -13,7 +13,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/add_text.py b/scripts/add_text.py
index 7bd005b..7120b99 100755
--- a/scripts/add_text.py
+++ b/scripts/add_text.py
@@ -68,7 +68,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/archivebot.py b/scripts/archivebot.py
index 84d1e96..6cbb002 100755
--- a/scripts/archivebot.py
+++ b/scripts/archivebot.py
@@ -92,7 +92,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/basic.py b/scripts/basic.py
index 188c9a1..f481eb0 100755
--- a/scripts/basic.py
+++ b/scripts/basic.py
@@ -20,7 +20,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py
index c4ca412..6c7eec1 100755
--- a/scripts/blockpageschecker.py
+++ b/scripts/blockpageschecker.py
@@ -54,7 +54,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/blockreview.py b/scripts/blockreview.py
index d754c8f..759fa9e 100755
--- a/scripts/blockreview.py
+++ b/scripts/blockreview.py
@@ -19,7 +19,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/capitalize_redirects.py b/scripts/capitalize_redirects.py
index f626fba..42af542 100755
--- a/scripts/capitalize_redirects.py
+++ b/scripts/capitalize_redirects.py
@@ -31,7 +31,7 @@
#
# Automatically converted from compat branch by compat2core.py script
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/casechecker.py b/scripts/casechecker.py
index 55f03c9..1a58aab 100755
--- a/scripts/casechecker.py
+++ b/scripts/casechecker.py
@@ -6,7 +6,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
__version__ = '$Id$'
import codecs
diff --git a/scripts/catall.py b/scripts/catall.py
index 0e525f9..c87ae30 100755
--- a/scripts/catall.py
+++ b/scripts/catall.py
@@ -24,7 +24,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/category.py b/scripts/category.py
index 537a1ab..3e20019 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -114,7 +114,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py
index fc8783f..9d78f7d 100755
--- a/scripts/category_redirect.py
+++ b/scripts/category_redirect.py
@@ -27,7 +27,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/cfd.py b/scripts/cfd.py
index 9bbf5b7..2c3f7fb 100755
--- a/scripts/cfd.py
+++ b/scripts/cfd.py
@@ -17,7 +17,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index b2f29b1..476ec96 100755
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -84,7 +84,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/claimit.py b/scripts/claimit.py
index 2d13b4c..cfbb5e6 100755
--- a/scripts/claimit.py
+++ b/scripts/claimit.py
@@ -54,7 +54,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py
index 679c25a..9df6529 100755
--- a/scripts/clean_sandbox.py
+++ b/scripts/clean_sandbox.py
@@ -35,7 +35,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import division, unicode_literals
+from __future__ import absolute_import, division, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/commons_link.py b/scripts/commons_link.py
index 4320e2d..d74b844 100755
--- a/scripts/commons_link.py
+++ b/scripts/commons_link.py
@@ -31,7 +31,7 @@
# Ported by Geoffrey "GEOFBOT" Mon for Google Code-In 2013
# User:Sn1per
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/scripts/commonscat.py b/scripts/commonscat.py
index 863cabe..5baf436 100755
--- a/scripts/commonscat.py
+++ b/scripts/commonscat.py
@@ -57,7 +57,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/coordinate_import.py b/scripts/coordinate_import.py
index b4c4f73..301ff7d 100755
--- a/scripts/coordinate_import.py
+++ b/scripts/coordinate_import.py
@@ -28,7 +28,7 @@
#
# Distributed under the terms of MIT License.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py
index cb2c318..7dabff4 100644
--- a/scripts/cosmetic_changes.py
+++ b/scripts/cosmetic_changes.py
@@ -31,7 +31,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/create_categories.py b/scripts/create_categories.py
index 5c7ac2b..e9c5902 100755
--- a/scripts/create_categories.py
+++ b/scripts/create_categories.py
@@ -30,7 +30,7 @@
to create [[Category:Cultural heritage monuments in Hensies]].
"""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py
index fb1da56..c77f393 100755
--- a/scripts/data_ingestion.py
+++ b/scripts/data_ingestion.py
@@ -12,7 +12,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/delete.py b/scripts/delete.py
index d263076..cd52c6d 100755
--- a/scripts/delete.py
+++ b/scripts/delete.py
@@ -33,7 +33,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/disambredir.py b/scripts/disambredir.py
index 4d07fb9..741a311 100755
--- a/scripts/disambredir.py
+++ b/scripts/disambredir.py
@@ -16,7 +16,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/djvutext.py b/scripts/djvutext.py
index b72b0b7..725c489 100644
--- a/scripts/djvutext.py
+++ b/scripts/djvutext.py
@@ -32,7 +32,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/scripts/editarticle.py b/scripts/editarticle.py
index ad0b422..1762fa8 100755
--- a/scripts/editarticle.py
+++ b/scripts/editarticle.py
@@ -27,7 +27,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/featured.py b/scripts/featured.py
index 6aa7c7f..a7458c1 100755
--- a/scripts/featured.py
+++ b/scripts/featured.py
@@ -61,7 +61,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py
index 561e61a..f41e15c 100755
--- a/scripts/fixing_redirects.py
+++ b/scripts/fixing_redirects.py
@@ -17,7 +17,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py
index b449d71..b486602 100755
--- a/scripts/flickrripper.py
+++ b/scripts/flickrripper.py
@@ -29,7 +29,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/freebasemappingupload.py b/scripts/freebasemappingupload.py
index 5722da6..0fab739 100755
--- a/scripts/freebasemappingupload.py
+++ b/scripts/freebasemappingupload.py
@@ -19,7 +19,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py
index c1ea88c..5d07bf5 100755
--- a/scripts/harvest_template.py
+++ b/scripts/harvest_template.py
@@ -29,7 +29,7 @@
#
# Distributed under the terms of MIT License.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/illustrate_wikidata.py b/scripts/illustrate_wikidata.py
index 632b200..7fa88bd 100755
--- a/scripts/illustrate_wikidata.py
+++ b/scripts/illustrate_wikidata.py
@@ -18,7 +18,7 @@
#
# Distributed under the terms of MIT License.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/image.py b/scripts/image.py
index f780856..b99f28d 100755
--- a/scripts/image.py
+++ b/scripts/image.py
@@ -41,7 +41,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/imagerecat.py b/scripts/imagerecat.py
index 2e9f2ba..39cd2d0 100755
--- a/scripts/imagerecat.py
+++ b/scripts/imagerecat.py
@@ -31,7 +31,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py
index 4421757..0df238f 100755
--- a/scripts/imagetransfer.py
+++ b/scripts/imagetransfer.py
@@ -31,7 +31,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/scripts/imageuncat.py b/scripts/imageuncat.py
index 025559f..7efd746 100755
--- a/scripts/imageuncat.py
+++ b/scripts/imageuncat.py
@@ -22,7 +22,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index e5ba01a..2791ff3 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -342,7 +342,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/isbn.py b/scripts/isbn.py
index e39f7ce..e2eaba5 100755
--- a/scripts/isbn.py
+++ b/scripts/isbn.py
@@ -39,7 +39,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/listpages.py b/scripts/listpages.py
index 9153d99..d2dc095 100755
--- a/scripts/listpages.py
+++ b/scripts/listpages.py
@@ -78,7 +78,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/login.py b/scripts/login.py
index 5d8c3ea..a88dff3 100755
--- a/scripts/login.py
+++ b/scripts/login.py
@@ -57,7 +57,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/lonelypages.py b/scripts/lonelypages.py
index 64d0a6b..d8d8992 100755
--- a/scripts/lonelypages.py
+++ b/scripts/lonelypages.py
@@ -38,7 +38,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py
index a799d51..8aa15b0 100755
--- a/scripts/maintenance/cache.py
+++ b/scripts/maintenance/cache.py
@@ -45,7 +45,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/maintenance/compat2core.py b/scripts/maintenance/compat2core.py
index e33ff04..ed1f1bd 100755
--- a/scripts/maintenance/compat2core.py
+++ b/scripts/maintenance/compat2core.py
@@ -30,7 +30,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/maintenance/make_i18n_dict.py
b/scripts/maintenance/make_i18n_dict.py
index de37f2c..639864a 100755
--- a/scripts/maintenance/make_i18n_dict.py
+++ b/scripts/maintenance/make_i18n_dict.py
@@ -31,7 +31,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/maintenance/wikimedia_sites.py
b/scripts/maintenance/wikimedia_sites.py
index ccd2417..f627f3c 100755
--- a/scripts/maintenance/wikimedia_sites.py
+++ b/scripts/maintenance/wikimedia_sites.py
@@ -7,7 +7,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/makecat.py b/scripts/makecat.py
index bf158ff..3417c61 100755
--- a/scripts/makecat.py
+++ b/scripts/makecat.py
@@ -37,7 +37,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/match_images.py b/scripts/match_images.py
index 769a0a4..80f8251 100755
--- a/scripts/match_images.py
+++ b/scripts/match_images.py
@@ -30,7 +30,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import division, unicode_literals
+from __future__ import absolute_import, division, unicode_literals
__version__ = '$Id$'
diff --git a/scripts/misspelling.py b/scripts/misspelling.py
index 4407fdd..c54ccc0 100755
--- a/scripts/misspelling.py
+++ b/scripts/misspelling.py
@@ -26,7 +26,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/movepages.py b/scripts/movepages.py
index 1b72afa..b28ff40 100755
--- a/scripts/movepages.py
+++ b/scripts/movepages.py
@@ -38,7 +38,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/newitem.py b/scripts/newitem.py
index e2e1783..a4be270 100755
--- a/scripts/newitem.py
+++ b/scripts/newitem.py
@@ -24,7 +24,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/noreferences.py b/scripts/noreferences.py
index b365e4f..c26f131 100755
--- a/scripts/noreferences.py
+++ b/scripts/noreferences.py
@@ -38,7 +38,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py
index 124b1fa..83e5a5b 100755
--- a/scripts/nowcommons.py
+++ b/scripts/nowcommons.py
@@ -56,7 +56,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py
index 4eb65a8..4579372 100755
--- a/scripts/pagefromfile.py
+++ b/scripts/pagefromfile.py
@@ -61,7 +61,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/patrol.py b/scripts/patrol.py
index 540bc42..5cc61e0 100755
--- a/scripts/patrol.py
+++ b/scripts/patrol.py
@@ -22,7 +22,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
import pywikibot
diff --git a/scripts/piper.py b/scripts/piper.py
index 11dd801..f42f917 100755
--- a/scripts/piper.py
+++ b/scripts/piper.py
@@ -34,7 +34,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/protect.py b/scripts/protect.py
index 038b158..bc3d75a 100755
--- a/scripts/protect.py
+++ b/scripts/protect.py
@@ -50,7 +50,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/redirect.py b/scripts/redirect.py
index 70ae9c7..b7bdc09 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -76,7 +76,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/reflinks.py b/scripts/reflinks.py
index 6b3978f..f5c73e4 100755
--- a/scripts/reflinks.py
+++ b/scripts/reflinks.py
@@ -42,7 +42,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import division, unicode_literals
+from __future__ import absolute_import, division, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/replace.py b/scripts/replace.py
index aa3b6ed..f93c841 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -132,7 +132,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/replicate_wiki.py b/scripts/replicate_wiki.py
index 538c439..e0845e3 100755
--- a/scripts/replicate_wiki.py
+++ b/scripts/replicate_wiki.py
@@ -42,7 +42,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/revertbot.py b/scripts/revertbot.py
index 0da068e..1477f17 100755
--- a/scripts/revertbot.py
+++ b/scripts/revertbot.py
@@ -21,7 +21,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/script_wui.py b/scripts/script_wui.py
index d50af44..320e4a6 100755
--- a/scripts/script_wui.py
+++ b/scripts/script_wui.py
@@ -60,7 +60,7 @@
# ...
# --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/selflink.py b/scripts/selflink.py
index 144dc3a..28f4bca 100755
--- a/scripts/selflink.py
+++ b/scripts/selflink.py
@@ -15,7 +15,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import pywikibot
diff --git a/scripts/shell.py b/scripts/shell.py
index d5f0e3f..0969fed 100755
--- a/scripts/shell.py
+++ b/scripts/shell.py
@@ -18,7 +18,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py
index cca88ab..8f9d511 100755
--- a/scripts/solve_disambiguation.py
+++ b/scripts/solve_disambiguation.py
@@ -75,7 +75,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/spamremove.py b/scripts/spamremove.py
index 725534d..c22d0e4 100755
--- a/scripts/spamremove.py
+++ b/scripts/spamremove.py
@@ -27,7 +27,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/scripts/states_redirect.py b/scripts/states_redirect.py
index a7b06fd..a602490 100755
--- a/scripts/states_redirect.py
+++ b/scripts/states_redirect.py
@@ -19,7 +19,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/template.py b/scripts/template.py
index ca35b61..facda7c 100755
--- a/scripts/template.py
+++ b/scripts/template.py
@@ -107,7 +107,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/templatecount.py b/scripts/templatecount.py
index 5e9bc34..07c0a81 100755
--- a/scripts/templatecount.py
+++ b/scripts/templatecount.py
@@ -36,7 +36,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/scripts/touch.py b/scripts/touch.py
index fb1031c..ccf92bf 100755
--- a/scripts/touch.py
+++ b/scripts/touch.py
@@ -18,7 +18,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/transferbot.py b/scripts/transferbot.py
index 4dae180..85a455b 100755
--- a/scripts/transferbot.py
+++ b/scripts/transferbot.py
@@ -40,7 +40,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/unlink.py b/scripts/unlink.py
index 9b64620..35948e6 100755
--- a/scripts/unlink.py
+++ b/scripts/unlink.py
@@ -24,7 +24,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/unusedfiles.py b/scripts/unusedfiles.py
index 30140aa..84df568 100755
--- a/scripts/unusedfiles.py
+++ b/scripts/unusedfiles.py
@@ -16,7 +16,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/upload.py b/scripts/upload.py
index 6a0fc53..060d111 100755
--- a/scripts/upload.py
+++ b/scripts/upload.py
@@ -51,7 +51,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/version.py b/scripts/version.py
index 3d42a86..87f6a29 100755
--- a/scripts/version.py
+++ b/scripts/version.py
@@ -8,7 +8,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/watchlist.py b/scripts/watchlist.py
index 20bfb2c..8e2e6f5 100755
--- a/scripts/watchlist.py
+++ b/scripts/watchlist.py
@@ -21,7 +21,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py
index a918601..6d00cce 100755
--- a/scripts/weblinkchecker.py
+++ b/scripts/weblinkchecker.py
@@ -95,7 +95,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/scripts/welcome.py b/scripts/welcome.py
index df68a09..de433ec 100755
--- a/scripts/welcome.py
+++ b/scripts/welcome.py
@@ -178,7 +178,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/setup.py b/setup.py
index 8369fe8..8fe7a0e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import itertools
import os
diff --git a/tests/__init__.py b/tests/__init__.py
index 053eb5b..5fa1e4b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/api_tests.py b/tests/api_tests.py
index 9ad71d5..21f526b 100644
--- a/tests/api_tests.py
+++ b/tests/api_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py
index edcfdce..c77c07c 100644
--- a/tests/archivebot_tests.py
+++ b/tests/archivebot_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/aspects.py b/tests/aspects.py
index 570f58f..e2b65a7 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -11,7 +11,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
__version__ = '$Id$'
"""
TODO:
diff --git a/tests/basepage_tests.py b/tests/basepage_tests.py
index a90542c..8017671 100644
--- a/tests/basepage_tests.py
+++ b/tests/basepage_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/bot_tests.py b/tests/bot_tests.py
index 788893b..4577029 100644
--- a/tests/bot_tests.py
+++ b/tests/bot_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/cache_tests.py b/tests/cache_tests.py
index 790cd19..70add5c 100644
--- a/tests/cache_tests.py
+++ b/tests/cache_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/category_tests.py b/tests/category_tests.py
index 4321d8b..7b0a114 100644
--- a/tests/category_tests.py
+++ b/tests/category_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/checkimages_tests.py b/tests/checkimages_tests.py
index f033a88..978547b 100644
--- a/tests/checkimages_tests.py
+++ b/tests/checkimages_tests.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
"""Unit tests for checkimages script."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
from scripts import checkimages
diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py
index f864c76..209d27b 100644
--- a/tests/cosmetic_changes_tests.py
+++ b/tests/cosmetic_changes_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/data/fixes.py b/tests/data/fixes.py
index fcdf8c1..5729aec 100644
--- a/tests/data/fixes.py
+++ b/tests/data/fixes.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Collection of fixes for tests."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
# flake8 cannot detect that fixes is defined via pywikibot.fixes
if 'fixes' not in globals():
diff --git a/tests/data/set-fixes.py b/tests/data/set-fixes.py
index ad6dd9c..6a6bdda 100644
--- a/tests/data/set-fixes.py
+++ b/tests/data/set-fixes.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Fixes implementation which overwrites the variable."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
# Just kill the old value suffices
fixes = {}
diff --git a/tests/data_ingestion_tests.py b/tests/data_ingestion_tests.py
index a5c2ff8..ee745a9 100644
--- a/tests/data_ingestion_tests.py
+++ b/tests/data_ingestion_tests.py
@@ -6,7 +6,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/date_tests.py b/tests/date_tests.py
index 340fb8d..c8fe5ab 100644
--- a/tests/date_tests.py
+++ b/tests/date_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
from datetime import datetime
diff --git a/tests/deletionbot_tests.py b/tests/deletionbot_tests.py
index f4a31fd..39b4c59 100644
--- a/tests/deletionbot_tests.py
+++ b/tests/deletionbot_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/deprecation_tests.py b/tests/deprecation_tests.py
index 160cf3e..8ecc982 100644
--- a/tests/deprecation_tests.py
+++ b/tests/deprecation_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/disambredir_tests.py b/tests/disambredir_tests.py
index c12dcd3..0b7fa08 100644
--- a/tests/disambredir_tests.py
+++ b/tests/disambredir_tests.py
@@ -9,7 +9,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/djvu_tests.py b/tests/djvu_tests.py
index a3dcc43..cbb3eb6 100644
--- a/tests/djvu_tests.py
+++ b/tests/djvu_tests.py
@@ -8,7 +8,7 @@
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import os
import subprocess
diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py
index 58221d1..400a6f5 100644
--- a/tests/dry_api_tests.py
+++ b/tests/dry_api_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py
index 5b103db..baa5687 100644
--- a/tests/dry_site_tests.py
+++ b/tests/dry_site_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/edit_failure_tests.py b/tests/edit_failure_tests.py
index 112d98c..17ed20e 100644
--- a/tests/edit_failure_tests.py
+++ b/tests/edit_failure_tests.py
@@ -12,7 +12,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/edit_tests.py b/tests/edit_tests.py
index 5ea3db9..a45134a 100644
--- a/tests/edit_tests.py
+++ b/tests/edit_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/exceptions_tests.py b/tests/exceptions_tests.py
index 252877b..853c3c1 100644
--- a/tests/exceptions_tests.py
+++ b/tests/exceptions_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/family_tests.py b/tests/family_tests.py
index bb5b11f..a676af9 100644
--- a/tests/family_tests.py
+++ b/tests/family_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/file_tests.py b/tests/file_tests.py
index 04b15df..6dae36c 100644
--- a/tests/file_tests.py
+++ b/tests/file_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/fixes_tests.py b/tests/fixes_tests.py
index b22e69c..a7eda6d 100644
--- a/tests/fixes_tests.py
+++ b/tests/fixes_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/flow_edit_tests.py b/tests/flow_edit_tests.py
index 4a3ce11..e8d2b33 100644
--- a/tests/flow_edit_tests.py
+++ b/tests/flow_edit_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/flow_tests.py b/tests/flow_tests.py
index 5ba6b7b..ddb04c1 100644
--- a/tests/flow_tests.py
+++ b/tests/flow_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/http_tests.py b/tests/http_tests.py
index d967c3a..8fcbe9b 100644
--- a/tests/http_tests.py
+++ b/tests/http_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/i18n/pywikibot.py b/tests/i18n/pywikibot.py
index f0c1382..47f0ac4 100644
--- a/tests/i18n/pywikibot.py
+++ b/tests/i18n/pywikibot.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
"""i18n message bundle called 'pywikibot' to fool the i18n
loader."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
msg = {}
diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py
index 7d4ed2e..9ff5913 100644
--- a/tests/i18n_tests.py
+++ b/tests/i18n_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/interwiki_graph_tests.py b/tests/interwiki_graph_tests.py
index 57a4039..ed5ae61 100644
--- a/tests/interwiki_graph_tests.py
+++ b/tests/interwiki_graph_tests.py
@@ -6,7 +6,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/interwiki_link_tests.py b/tests/interwiki_link_tests.py
index 8b07ead..e5050b6 100644
--- a/tests/interwiki_link_tests.py
+++ b/tests/interwiki_link_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/isbn_tests.py b/tests/isbn_tests.py
index 5ae1857..9f69939 100644
--- a/tests/isbn_tests.py
+++ b/tests/isbn_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import pywikibot
diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py
index 8cdc872..d662647 100644
--- a/tests/l10n_tests.py
+++ b/tests/l10n_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/link_tests.py b/tests/link_tests.py
index 8176057..804d5af 100644
--- a/tests/link_tests.py
+++ b/tests/link_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/logentry_tests.py b/tests/logentry_tests.py
index 82447e8..7bd126e 100644
--- a/tests/logentry_tests.py
+++ b/tests/logentry_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/mediawikiversion_tests.py b/tests/mediawikiversion_tests.py
index 34b2274..9666170 100644
--- a/tests/mediawikiversion_tests.py
+++ b/tests/mediawikiversion_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py
index c021b4d..7cce7c5 100644
--- a/tests/namespace_tests.py
+++ b/tests/namespace_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/oauth_tests.py b/tests/oauth_tests.py
index ecb9fb2..a0bf0e0 100644
--- a/tests/oauth_tests.py
+++ b/tests/oauth_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/page_tests.py b/tests/page_tests.py
index 6496e85..a8359a8 100644
--- a/tests/page_tests.py
+++ b/tests/page_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index 8fd7517..10181a4 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -5,7 +5,7 @@
# (C) Pywikibot team, 2009-2015
#
# Distributed under the terms of the MIT license.
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py
index 73dbf21..d4fd436 100644
--- a/tests/paraminfo_tests.py
+++ b/tests/paraminfo_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py
index cf3cc2b..b16ec0e 100644
--- a/tests/proofreadpage_tests.py
+++ b/tests/proofreadpage_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/protectbot_tests.py b/tests/protectbot_tests.py
index 260ac6a..7c2f868 100644
--- a/tests/protectbot_tests.py
+++ b/tests/protectbot_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/pwb/print_env.py b/tests/pwb/print_env.py
index 3bdf8ad..9260f95 100644
--- a/tests/pwb/print_env.py
+++ b/tests/pwb/print_env.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
"""Script that forms part of pwb_tests."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import os
import sys
diff --git a/tests/pwb/print_locals.py b/tests/pwb/print_locals.py
index 261327a..01765ba 100644
--- a/tests/pwb/print_locals.py
+++ b/tests/pwb/print_locals.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
"""Script that forms part of pwb_tests."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import os.path
diff --git a/tests/pwb/print_unicode.py b/tests/pwb/print_unicode.py
index a8fa757..f3a723f 100644
--- a/tests/pwb/print_unicode.py
+++ b/tests/pwb/print_unicode.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
"""Script that forms part of pwb_tests."""
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
import pywikibot
diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py
index 80bcf87..84718e3 100644
--- a/tests/pwb_tests.py
+++ b/tests/pwb_tests.py
@@ -11,7 +11,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/python_tests.py b/tests/python_tests.py
index 1f958d9..16023ed 100755
--- a/tests/python_tests.py
+++ b/tests/python_tests.py
@@ -5,7 +5,7 @@
# (C) Pywikibot team, 2015
#
# Distributed under the terms of the MIT license.
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/reflinks_tests.py b/tests/reflinks_tests.py
index 6834223..27023d0 100644
--- a/tests/reflinks_tests.py
+++ b/tests/reflinks_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py
index 04d8c30..8794795 100644
--- a/tests/replacebot_tests.py
+++ b/tests/replacebot_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/script_tests.py b/tests/script_tests.py
index 3fd9596..8bbe085 100644
--- a/tests/script_tests.py
+++ b/tests/script_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
__version__ = '$Id$'
import os
diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py
index 4580f41..cfde088 100644
--- a/tests/site_detect_tests.py
+++ b/tests/site_detect_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/site_tests.py b/tests/site_tests.py
index 2439b8d..2b41257 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/tests_tests.py b/tests/tests_tests.py
index 499008b..b0b82bd 100755
--- a/tests/tests_tests.py
+++ b/tests/tests_tests.py
@@ -5,7 +5,7 @@
# (C) Pywikibot team, 2014
#
# Distributed under the terms of the MIT license.
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py
index f5e3bad..ff37a56 100644
--- a/tests/textlib_tests.py
+++ b/tests/textlib_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/thread_tests.py b/tests/thread_tests.py
index 7dfdaf6..0f640be 100644
--- a/tests/thread_tests.py
+++ b/tests/thread_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/timestamp_tests.py b/tests/timestamp_tests.py
index 5d7dc43..3c359e1 100644
--- a/tests/timestamp_tests.py
+++ b/tests/timestamp_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py
index 5d6a209..98d6d35 100644
--- a/tests/timestripper_tests.py
+++ b/tests/timestripper_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/tk_tests.py b/tests/tk_tests.py
index e625e98..cc430fa 100644
--- a/tests/tk_tests.py
+++ b/tests/tk_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/tools_chars_tests.py b/tests/tools_chars_tests.py
index f8e5cd4..2e42f8d 100644
--- a/tests/tools_chars_tests.py
+++ b/tests/tools_chars_tests.py
@@ -5,7 +5,7 @@
# (C) Pywikibot team, 2015
#
# Distributed under the terms of the MIT license.
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/tools_formatter_tests.py b/tests/tools_formatter_tests.py
index 256f2ed..74d9768 100644
--- a/tests/tools_formatter_tests.py
+++ b/tests/tools_formatter_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/tools_ip_tests.py b/tests/tools_ip_tests.py
index b9c3646..542e725 100644
--- a/tests/tools_ip_tests.py
+++ b/tests/tools_ip_tests.py
@@ -5,7 +5,7 @@
# (C) Pywikibot team, 2012-2015
#
# Distributed under the terms of the MIT license.
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/tools_tests.py b/tests/tools_tests.py
index c19e354..4d98d49 100644
--- a/tests/tools_tests.py
+++ b/tests/tools_tests.py
@@ -5,7 +5,7 @@
# (C) Pywikibot team, 2015
#
# Distributed under the terms of the MIT license.
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/ui_options_tests.py b/tests/ui_options_tests.py
index 0246ed9..6c145a2 100644
--- a/tests/ui_options_tests.py
+++ b/tests/ui_options_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/ui_tests.py b/tests/ui_tests.py
index 983fa3e..fb8ef3c 100644
--- a/tests/ui_tests.py
+++ b/tests/ui_tests.py
@@ -24,7 +24,7 @@
# easy_install --upgrade
https://pywinauto.googlecode.com/files/pywinauto-0.4.2.zip
#
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/upload_tests.py b/tests/upload_tests.py
index aed4a18..610a9d8 100644
--- a/tests/upload_tests.py
+++ b/tests/upload_tests.py
@@ -9,7 +9,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/uploadbot_tests.py b/tests/uploadbot_tests.py
index f017ef9..a1da9de 100644
--- a/tests/uploadbot_tests.py
+++ b/tests/uploadbot_tests.py
@@ -9,7 +9,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/utils.py b/tests/utils.py
index 8fe7315..6d29604 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
__version__ = '$Id$'
#
import inspect
diff --git a/tests/weblib_tests.py b/tests/weblib_tests.py
index 65cc6a1..d1e93aa 100644
--- a/tests/weblib_tests.py
+++ b/tests/weblib_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/weblinkchecker_tests.py b/tests/weblinkchecker_tests.py
index 52a1b5a..e3682a7 100644
--- a/tests/weblinkchecker_tests.py
+++ b/tests/weblinkchecker_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py
index f109d13..a618b06 100644
--- a/tests/wikibase_edit_tests.py
+++ b/tests/wikibase_edit_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py
index 5f37a54..248d324 100644
--- a/tests/wikibase_tests.py
+++ b/tests/wikibase_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/wikidataquery_tests.py b/tests/wikidataquery_tests.py
index b5ee548..0d2c441 100644
--- a/tests/wikidataquery_tests.py
+++ b/tests/wikidataquery_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/wikistats_tests.py b/tests/wikistats_tests.py
index f9e727f..883c146 100644
--- a/tests/wikistats_tests.py
+++ b/tests/wikistats_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
#
diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py
index 8534076..3f11ba8 100644
--- a/tests/xmlreader_tests.py
+++ b/tests/xmlreader_tests.py
@@ -5,7 +5,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
__version__ = '$Id$'
diff --git a/tox.ini b/tox.ini
index 6f623b0..6884c5d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -236,7 +236,7 @@
-rdocs/requirements-py3.txt
[flake8]
-ignore = E241,E402,E731,FI10,FI11,FI12,FI13,FI15,FI5,P102,P103
+ignore = E241,E402,E731,FI10,FI12,FI13,FI15,FI5,P102,P103
exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/*
max_line_length = 130
accept-encodings = utf-8
--
To view, visit
https://gerrit.wikimedia.org/r/236715
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie29d16d94c3e718d796103634edf6fd40de69115
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Mattflaschen <mflaschen(a)wikimedia.org>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>