Consolidate PY3K compatibility libraries

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

3 files changed, 4 insertions, 27 deletions

diff --git a/src/lib/Server/Reports/importscript.py b/src/lib/Server/Reports/importscript.py
index 0766ffa94..1781e2fac 100755
--- a/src/lib/Server/Reports/importscript.py
+++ b/src/lib/Server/Reports/importscript.py
@@ -34,8 +34,8 @@ import logging
 import Bcfg2.Logger
 import platform
 
-# Compatibility imports
-from py3kcompat import ConfigParser
+# Compatibility import
+from Bcfg2.Bcfg2Py3k import ConfigParser
 
 
 def build_reason_kwargs(r_ent):
diff --git a/src/lib/Server/Reports/py3kcompat.py b/src/lib/Server/Reports/py3kcompat.py
deleted file mode 100644
index b334c4466..000000000
--- a/src/lib/Server/Reports/py3kcompat.py
+++ /dev/null
@@ -1,24 +0,0 @@
-try:
-    from email.Utils import formatdate
-except ImportError:
-    from email.utils import formatdate
-
-# urllib imports
-try:
-    from urllib import urlopen
-except ImportError:
-    from urllib.request import urlopen
-try:
-    from urlparse import urljoin
-except ImportError:
-    from urllib.parse import urljoin
-
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from io import StringIO
-
-try:
-    import ConfigParser
-except ImportError:
-    import configparser as ConfigParser
diff --git a/src/lib/Server/Reports/settings.py b/src/lib/Server/Reports/settings.py
index 0b9d25776..5a9e4ae4b 100644
--- a/src/lib/Server/Reports/settings.py
+++ b/src/lib/Server/Reports/settings.py
@@ -1,7 +1,8 @@
 import django
 
+# Compatibility import
+from Bcfg2.Bcfg2Py3k import ConfigParser
 # Django settings for bcfg2 reports project.
-from py3kcompat import ConfigParser
 c = ConfigParser()
 c.read(['/etc/bcfg2.conf', '/etc/bcfg2-web.conf'])