Add basic Python 3 compatiblity fixing imports #280

Signed-off-by: Thomas Druez <[email protected]>

Author: tdruez

src/attributecode/api.py

@@ -17,13 +17,20 @@
 from __future__ import absolute_import
 from __future__ import print_function
 
-import httplib
 import json
 import urllib
-import urllib2
-
 from collections import namedtuple
 
+try:
+    import httplib  # Python 2
+except ImportError:
+    import http.client as httplib  # Python 3
+
+try:
+    import urllib2  # Python 2
+except ImportError:
+    import urllib as urllib2  # Python 3
+
 from attributecode import ERROR
 from attributecode import Error
 

src/attributecode/model.py

@@ -31,12 +31,24 @@
 import os
 import posixpath
 import re
-import urllib2
 import unicodecsv
-
 from collections import OrderedDict
 from posixpath import dirname
-from urlparse import urljoin, urlparse
+
+try:
+    import urllib2  # Python 2
+except ImportError:
+    import urllib as urllib2  # Python 3
+
+try:
+    from urlparse import urljoin, urlparse  # Python 2
+except ImportError:
+    from urllib.parse import urljoin, urlparse  # Python 3
+
+try:
+    basestring  # Python 2
+except NameError:
+    basestring = str  # Python 3
 
 from attributecode import CRITICAL
 from attributecode import ERROR
@@ -757,7 +769,7 @@ def all_fields(self, with_absent=True, with_empty=True):
         If with_empty, include empty fields.
         """
         all_fields = []
-        for field in self.fields.values() + self.custom_fields.values():
+        for field in list(self.fields.values()) + list(self.custom_fields.values()):
             if field.required:
                 all_fields.append(field)
             # TODO: The following code need refactor

src/attributecode/saneyaml.py

@@ -29,6 +29,11 @@
     from yaml import SafeLoader
     from yaml import SafeDumper
 
+try:
+    unicode  # Python 2
+except NameError:
+    unicode = str  # Python 3
+
 
 """
 Wrapper around PyYAML to provide sane defaults ensuring that dump/load does

src/attributecode/util.py

@@ -18,7 +18,6 @@
 
 import codecs
 import errno
-import httplib
 import json
 import ntpath
 import os
@@ -28,12 +27,16 @@
 import string
 import sys
 import unicodecsv
-
 from collections import OrderedDict
 from os.path import abspath
 from os.path import dirname
 from os.path import join
 
+try:
+    import httplib  # Python 2
+except ImportError:
+    import http.client as httplib  # Python 3
+
 from attributecode import CRITICAL, Error