jenkins-bot has submitted this change and it was merged.
Change subject: Bug 58053 - py3k: Fix various imports ......................................................................
Bug 58053 - py3k: Fix various imports
Change-Id: I0e56a114bf387200442d97e0091a52b51e9e0ac1 --- M pywikibot/bot.py M pywikibot/comms/http.py M pywikibot/comms/threadedhttp.py M pywikibot/data/api.py M pywikibot/date.py M pywikibot/page.py M pywikibot/site.py 7 files changed, 36 insertions(+), 10 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py index b571fe7..9e28ab4 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -34,6 +34,8 @@ from pywikibot import config from pywikibot import version
+if sys.version_info[0] > 2: + unicode = str
# User interface initialization # search for user interface module in the 'userinterfaces' subdirectory diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index b6adccf..6a4c287 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -21,20 +21,24 @@ __version__ = '$Id$' __docformat__ = 'epytext'
-import Queue import urllib -import urlparse import logging import atexit
try: from httplib2 import SSLHandshakeError + import Queue + import urlparse + import cookielib except ImportError: from ssl import SSLError as SSLHandshakeError + import queue as Queue + import urllib as urlparse + from http import cookiejar as cookielib + from pywikibot import config from pywikibot.exceptions import FatalServerError, Server504Error import pywikibot -import cookielib from . import threadedhttp import pywikibot.version
diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py index 800af44..2ceaf72 100644 --- a/pywikibot/comms/threadedhttp.py +++ b/pywikibot/comms/threadedhttp.py @@ -21,14 +21,18 @@ __docformat__ = 'epytext'
# standard python libraries +import sys import re import threading import time import logging
import urllib -import cookielib -import sys + +try: + import cookielib +except ImportError: + from http import cookiejar as cookielib
import pywikibot from pywikibot import config diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 2d8c4d9..00f0eab 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -34,6 +34,10 @@ from pywikibot import config, login from pywikibot.exceptions import *
+import sys +if sys.version_info[0] > 2: + basestring = (str, ) + _logger = "data.api"
lagpattern = re.compile(r"Waiting for [\d.]+: (?P<lag>\d+) seconds? lagged") diff --git a/pywikibot/date.py b/pywikibot/date.py index 5f7cb8b..6e39e96 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -18,6 +18,11 @@ #
import re +import sys + +if sys.version_info[0] > 2: + unicode = str + basestring = (str,)
# # Different collections of well known formats diff --git a/pywikibot/page.py b/pywikibot/page.py index 759093a..f3807dc 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -17,17 +17,21 @@ import pywikibot.site
import hashlib -import htmlentitydefs + +try: + import htmlentitydefs + from urllib.parse import quote_from_bytes, unquote_to_bytes +except ImportError: + unicode = str + from html import entities as htmlentitydefs + from urllib import quote as quote_from_bytes, unquote as unquote_to_bytes + import logging import re import unicodedata import collections
import urllib -try: - from urllib.parse import quote_from_bytes, unquote_to_bytes -except ImportError: - from urllib import quote as quote_from_bytes, unquote as unquote_to_bytes
logger = logging.getLogger("pywiki.wiki.page")
diff --git a/pywikibot/site.py b/pywikibot/site.py index 9f36234..fe9fb16 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -34,6 +34,9 @@ from pywikibot.data import api from pywikibot.exceptions import *
+if sys.version_info[0] > 2: + basestring = (str,) + _logger = "wiki.site"