Skip to content

Commit 854773f

Browse files
abncrobinso
abn
authored and
crobinso
committed
Make imports python3 compatible
1 parent 0575fce commit 854773f

5 files changed

Lines changed: 37 additions & 9 deletions

File tree

‎bin/bugzilla‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@ import socket
2323
import sys
2424
import tempfile
2525

26-
from xmlrpclib import Fault, ProtocolError
26+
if sys.version_info.major >= 3:
27+
# pylint: disable=F0401,W0622
28+
from xmlrpc.client import Fault, ProtocolError
29+
basestring = (str, bytes)
30+
else:
31+
from xmlrpclib import Fault, ProtocolError
32+
2733
from requests.exceptions import SSLError
2834

2935
import bugzilla

‎bugzilla/__init__.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,14 @@
1212
__version__ = "0.9.0"
1313
version = __version__
1414

15+
import sys
1516
from logging import getLogger
16-
from xmlrpclib import Fault, ServerProxy
17+
18+
if sys.version_info.major >= 3:
19+
# pylint: disable=F0401
20+
from xmlrpc.client import Fault, ServerProxy
21+
else:
22+
from xmlrpclib import Fault, ServerProxy
1723

1824
log = getLogger("bugzilla")
1925

‎bugzilla/base.py‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,21 @@
1313
import os
1414
import sys
1515

16-
from ConfigParser import SafeConfigParser
17-
from cookielib import LoadError, LWPCookieJar, MozillaCookieJar
1816
from io import BytesIO
19-
from urlparse import urlparse, parse_qsl
20-
from xmlrpclib import Binary, Fault, ProtocolError, ServerProxy, Transport
17+
18+
if sys.version_info.major >= 3:
19+
# pylint: disable=F0401,E0611
20+
from configparser import SafeConfigParser
21+
from http.cookiejar import LoadError, LWPCookieJar, MozillaCookieJar
22+
from urllib.parse import urlparse, parse_qsl
23+
from xmlrpc.client import (
24+
Binary, Fault, ProtocolError, ServerProxy, Transport)
25+
else:
26+
from ConfigParser import SafeConfigParser
27+
from cookielib import LoadError, LWPCookieJar, MozillaCookieJar
28+
from urlparse import urlparse, parse_qsl
29+
from xmlrpclib import (
30+
Binary, Fault, ProtocolError, ServerProxy, Transport)
2131

2232
import requests
2333

‎tests/__init__.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
from __future__ import print_function
33

44
import atexit
5-
import commands
65
import difflib
76
import imp
87
import os
98
import shlex
109
import sys
1110

12-
from StringIO import StringIO
11+
if sys.version_info.major >= 3:
12+
from io import StringIO
13+
else:
14+
from StringIO import StringIO
1315

1416

1517
_cleanup = []

‎tests/rw_functional.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
import sys
1818
import unittest
1919

20-
from urlparse import urlparse
20+
if sys.version_info.major >= 3:
21+
# pylint: disable=F0401,E0611
22+
from urllib.parse import urlparse
23+
else:
24+
from urlparse import urlparse
2125

2226
import bugzilla
2327
from bugzilla import Bugzilla

0 commit comments

Comments
 (0)