1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py
index 4bcc76e8f..44c76303c 100644
--- a/src/lib/Bcfg2/Compat.py
+++ b/src/lib/Bcfg2/Compat.py
@@ -19,12 +19,13 @@ except ImportError:
 
 # urllib imports
 try:
+    from urllib import quote_plus
     from urlparse import urljoin, urlparse
     from urllib2 import HTTPBasicAuthHandler, \
         HTTPPasswordMgrWithDefaultRealm, build_opener, install_opener, \
         urlopen, HTTPError, URLError
 except ImportError:
-    from urllib.parse import urljoin, urlparse
+    from urllib.parse import urljoin, urlparse, quote_plus
     from urllib.request import HTTPBasicAuthHandler, \
         HTTPPasswordMgrWithDefaultRealm, build_opener, install_opener, urlopen
     from urllib.error import HTTPError, URLError
@@ -262,3 +263,10 @@ def oct_mode(mode):
     :type mode: int
     :returns: string """
     return oct(mode).replace('o', '')
+
+
+try:
+    long = long
+except NameError:
+    # longs are just ints in py3k
+    long = int