Merge pull request #580 from tseaver/add-python-3.4

Add python 3.4

.travis.yml

@@ -12,6 +12,7 @@ install:
 script:
   - tox -e py26
   - tox -e py27
+  - tox -e py34
   - tox -e lint
   - tox -e regression
   - scripts/merge.sh

_gcloud_vendor/apitools/base/py/http_wrapper.py

@@ -9,11 +9,11 @@
 import logging
 import socket
 import time
-import urlparse
 
 import httplib2
 from six.moves import http_client
 from six.moves import range
+from six.moves.urllib.parse import urlsplit
 
 from _gcloud_vendor.apitools.base.py import exceptions
 from _gcloud_vendor.apitools.base.py import util
@@ -127,7 +127,7 @@ def MakeRequest(http, http_request, retries=5, redirections=5):
   # wants control over the underlying connection for managing callbacks
   # or hash digestion.
   if getattr(http, 'connections', None):
-    url_scheme = urlparse.urlsplit(http_request.url).scheme
+    url_scheme = urlsplit(http_request.url).scheme
     if url_scheme and url_scheme in http.connections:
       connection_type = http.connections[url_scheme]
   for retry in range(retries + 1):

_gcloud_vendor/apitools/base/py/transfer.py

@@ -9,7 +9,6 @@
 import json
 import mimetypes
 import os
-import StringIO
 import threading
 
 from six.moves import http_client
@@ -568,7 +567,7 @@ def __ConfigureMultipartRequest(self, http_request):
 
     # encode the body: note that we can't use `as_string`, because
     # it plays games with `From ` lines.
-    fp = StringIO.StringIO()
+    fp = io.StringIO()
     g = email_generator.Generator(fp, mangle_from_=False)
     g.flatten(msg_root, unixfrom=False)
     http_request.body = fp.getvalue()

_gcloud_vendor/apitools/base/py/util.py

@@ -4,11 +4,12 @@
 import collections
 import os
 import random
-import urllib
-import urllib2
 
 import six
 from six.moves import http_client
+from six.moves.urllib.error import URLError
+from six.moves.urllib.parse import quote
+from six.moves.urllib.request import urlopen
 
 from _gcloud_vendor.apitools.base.py import exceptions
 
@@ -44,8 +45,8 @@ def DetectGce():
     True iff we're running on a GCE instance.
   """
   try:
-    o = urllib2.urlopen('http://metadata.google.internal')
-  except urllib2.URLError:
+    o = urlopen('http://metadata.google.internal')
+  except URLError:
     return False
   return (o.getcode() == http_client.OK and
           o.headers.get('metadata-flavor') == 'Google')
@@ -103,7 +104,7 @@ def ExpandRelativePath(method_config, params, relative_path=None):
       if not isinstance(value, six.string_types):
         value = str(value)
       path = path.replace(param_template,
-                          urllib.quote(value.encode('utf_8'), reserved_chars))
+                          quote(value.encode('utf_8'), reserved_chars))
     except TypeError as e:
       raise exceptions.InvalidUserInputError(
           'Error setting required parameter %s to value %s: %s' % (

gcloud/credentials.py

@@ -17,8 +17,8 @@
 import base64
 import calendar
 import datetime
-import urllib
 import six
+from six.moves.urllib.parse import urlencode  # pylint: disable=F0401
 
 from Crypto.Hash import SHA256
 from Crypto.PublicKey import RSA
@@ -260,4 +260,4 @@ def generate_signed_url(credentials, resource, expiration,
     # Return the built URL.
     return '{endpoint}{resource}?{querystring}'.format(
         endpoint=api_access_endpoint, resource=resource,
-        querystring=urllib.urlencode(query_params))
+        querystring=urlencode(query_params))