@@ -26,7 +26,11 @@
 import hashlib
 import hmac
 import requests
-import urllib
+
+try: # Python 3
+    from urllib.parse import urlencode
+except ImportError: # Python 2
+    from urllib import urlencode
 
 
 _VERSION = "0.1"
@@ -95,12 +99,12 @@ def _auth_url(self, path, params):
         """
         if self.key:
             params["key"] = self.key
-            return path + "?" + urllib.urlencode(params)
+            return path + "?" + urlencode(params)
 
         if self.client_id and self.client_secret:
             params["client"] = self.client_id
 
-            path = path + "?" + urllib.urlencode(params)
+            path = path + "?" + urlencode(params)
             sig = _hmac_sign(self.client_secret, path)
             return path + "&signature=" + sig
 
@@ -160,3 +164,15 @@ def _get(ctx, url, params, first_request_time=None):
 
     # TODO(mdr-eng): use body["error_message"] if present.
     raise Exception("API error: %s" % body["status"])
+
+def _isstr(v):
+    """Determines whether the passed value is a string, safe for 2/3.
+    
+    :param v: Object to check
+    :type ctx: basestring or object
+    """
+    try:
+        basestring
+    except NameError:
+        return isinstance(v, str)
+    return isinstance(v, basestring)
@@ -121,7 +121,7 @@ def directions(ctx, origin, destination,
     return common._get(ctx, "/maps/api/directions/json", params)["routes"]
 
 def _convert_waypoint(waypoint):
-    if not isinstance(waypoint, basestring):
+    if not common._isstr(waypoint):
         return convert.latlng(waypoint)
 
     return waypoint
@@ -103,5 +103,5 @@ def _convert_path(waypoints):
         waypoints = as_list(waypoints)
 
     return convert.join_list("|",
-            [(k if isinstance(k, basestring) else convert.latlng(k))
+            [(k if common._isstr(k) else convert.latlng(k))
                 for k in waypoints])
@@ -26,28 +26,28 @@ def main():
             timeout=5)
 
     locations = [(40.714728, -73.998672), (-34.397, 150.644)]
-    print googlemaps.elevation(c, locations)
-    print googlemaps.elevation(c, (40.714728, -73.998672))
+    print(googlemaps.elevation(c, locations))
+    print(googlemaps.elevation(c, (40.714728, -73.998672)))
 
-    print googlemaps.elevation_along_path(c, locations, 3)
+    print(googlemaps.elevation_along_path(c, locations, 3))
 
     geocoded = googlemaps.geocode(c, "48 Pirrama Rd")
 
-    print geocoded
+    print(geocoded)
 
-    print googlemaps.reverse_geocode(c, geocoded[0]["geometry"]["location"])
+    print(googlemaps.reverse_geocode(c, geocoded[0]["geometry"]["location"]))
 
-    print googlemaps.reverse_geocode(c,
+    print(googlemaps.reverse_geocode(c,
             latlng=(-33.86536501970851,151.1969187802915),
-            result_type=["country", "political"])
+            result_type=["country", "political"]))
 
-    print googlemaps.geocode(c, components={"country": "US"})
+    print(googlemaps.geocode(c, components={"country": "US"}))
 
-    print googlemaps.directions(c,
+    print(googlemaps.directions(c,
             "Sydney",
             "Melbourne",
             alternatives=True
-    )
+    ))
 
 if __name__ == '__main__':
     main()
@@ -21,7 +21,12 @@
 import googlemaps
 from googlemaps import common
 import unittest
-import urlparse
+
+try: # Python 3
+    from urllib.parse import urlparse
+except ImportError: # Python 2
+    from urlparse import urlparse
+
 
 # NOTE: the current version of "sesponses" doesn't have request_callback.
 # Use the master version until it's released.
@@ -53,7 +58,7 @@ def test_key_sent(self):
 
         self.assertEquals(1, len(responses.calls))
 
-        url = urlparse.urlparse(responses.calls[0].request.url)
+        url = urlparse(responses.calls[0].request.url)
         self.assertEquals("key=AIzaasdf&address=Sesame+St.", url.query)
 
     def test_hmac(self):
@@ -83,7 +88,7 @@ def test_url_signed(self):
 
         self.assertEquals(1, len(responses.calls))
 
-        url = urlparse.urlparse(responses.calls[0].request.url)
+        url = urlparse(responses.calls[0].request.url)
         expected = "client=foo&address=Sesame+St.&signature=Ao1r8ULP1g_vPwnf7Fvf2TSCYBQ="
         self.assertEquals(expected, url.query)