Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112334
Change subject: (bug 59970) Python 3 import blocks are now explicit
......................................................................
(bug 59970) Python 3 import blocks are now explicit
Instead of try:... except ImportError:..., we now use
if sys.version_info[0] == 2.
Change-Id: Ib4199604b62d8bb276db6d1d3ff592a71a4e5e93
---
M pywikibot/__init__.py
M pywikibot/comms/http.py
M pywikibot/comms/threadedhttp.py
M pywikibot/textlib.py
4 files changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/34/112334/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index bd7bd73..b9edb35 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -18,10 +18,10 @@
import sys
import threading
-try:
- from queue import Queue
-except ImportError:
+if sys.version_info[0] == 2:
from Queue import Queue
+else:
+ from queue import Queue
# Use pywikibot. prefix for all in-package imports; this is to prevent
# confusion with similarly-named modules in version 1 framework, for users
diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py
index 2aafc7d..a3a25fc 100644
--- a/pywikibot/comms/http.py
+++ b/pywikibot/comms/http.py
@@ -27,12 +27,12 @@
import atexit
import time
-try:
+if sys.version_info[0] == 2:
from httplib2 import SSLHandshakeError
import Queue
import urlparse
import cookielib
-except ImportError:
+else:
from ssl import SSLError as SSLHandshakeError
import queue as Queue
import urllib as urlparse
diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py
index 0447b77..3b6f6a8 100644
--- a/pywikibot/comms/threadedhttp.py
+++ b/pywikibot/comms/threadedhttp.py
@@ -29,9 +29,9 @@
import urllib
-try:
+if sys.version_info[0] == 2:
import cookielib
-except ImportError:
+else:
from http import cookiejar as cookielib
import pywikibot
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 4ce5607..725d676 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -21,9 +21,10 @@
import pywikibot
import datetime
import re
-try:
+import sys
+if sys.version_info[0] == 2:
from HTMLParser import HTMLParser
-except ImportError:
+else:
from html.parser import HTMLParser
from . import config2 as config
--
To view, visit https://gerrit.wikimedia.org/r/112334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4199604b62d8bb276db6d1d3ff592a71a4e5e93
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <valhall...@arctus.nl>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
