Attempt to import using Python 3 stdlib names first.

JNRowe · JNRowe · commit edb064d57776 · 2011-12-13T14:32:04.000Z
diff --git a/github2/issues.py b/github2/issues.py
@@ -1,4 +1,7 @@
-import urllib
+try:
+    from urllib.parse import quote_plus  # For Python 3
+except ImportError:
+    from urllib import quote_plus
 
 from github2.core import (GithubCommand, BaseData, Attribute, DateAttribute,
                           repr_string, requires_auth)
@@ -47,9 +50,8 @@ def search(self, project, term, state="open"):
         :param str term: term to search issues for
         :param str state: can be either ``open`` or ``closed``.
         """
-        return self.get_values("search", project, state,
-                               urllib.quote_plus(term), filter="issues",
-                               datatype=Issue)
+        return self.get_values("search", project, state, quote_plus(term),
+                               filter="issues", datatype=Issue)
 
     def list(self, project, state="open"):
         """Get all issues for project with given state.
diff --git a/github2/request.py b/github2/request.py
@@ -3,18 +3,25 @@
 import re
 import time
 import httplib2
-from httplib import responses
+try:
+    from http.client import responses  # For Python 3
+except ImportError:
+    from httplib import responses
 try:
     import json as simplejson  # For Python 2.6
 except ImportError:
     import simplejson
 from os import path
-from urlparse import (urlsplit, urlunsplit)
 try:
-    from urlparse import parse_qs
+    # For Python 3
+    from urllib.parse import (parse_qs, quote, urlencode, urlsplit, urlunsplit)
 except ImportError:
-    from cgi import parse_qs
-from urllib import urlencode, quote
+    from urlparse import (urlsplit, urlunsplit)
+    try:
+        from urlparse import parse_qs
+    except ImportError:
+        from cgi import parse_qs
+    from urllib import urlencode, quote
 
 
 #: Hostname for API access
diff --git a/github2/users.py b/github2/users.py
@@ -1,6 +1,10 @@
+try:
+    from urllib.parse import quote_plus  # For Python 3
+except ImportError:
+    from urllib import quote_plus
+
 from github2.core import (BaseData, GithubCommand, DateAttribute, Attribute,
                           enhanced_by_auth, requires_auth)
-import urllib
 
 
 class User(BaseData):
@@ -48,8 +52,8 @@ def search(self, query):
 
         :param str query: term to search for
         """
-        return self.get_values("search", urllib.quote_plus(query),
-                               filter="users", datatype=User)
+        return self.get_values("search", quote_plus(query), filter="users",
+                               datatype=User)
 
     def search_by_email(self, query):
         """Search for users by email address
