Always use bytes instead of six.binary_type

saaros · saaros · commit 3584b074674a · 2015-04-07T12:20:05.000+03:00
`bytes` was introduced in Python 2.6 as an alias for `str`.
`six.binary_type` is equivalent to it, but it makes sense to use the native
type instead of a compatibilty libray type when there's no difference in
them.

`bytes` was already being used in most places, this commit replaces the
three remaining uses.
diff --git a/oauth2client/service_account.py b/oauth2client/service_account.py
@@ -19,7 +19,6 @@
 
 import base64
 import json
-import six
 import time
 
 from pyasn1.codec.ber import decoder
@@ -130,7 +129,7 @@ def _urlsafe_b64encode(data):
 def _get_private_key(private_key_pkcs8_text):
   """Get an RSA private key object from a pkcs8 representation."""
 
-  if not isinstance(private_key_pkcs8_text, six.binary_type):
+  if not isinstance(private_key_pkcs8_text, bytes):
     private_key_pkcs8_text = private_key_pkcs8_text.encode('ascii')
   der = rsa.pem.load_pem(private_key_pkcs8_text, 'PRIVATE KEY')
   asn1_private_key, _ = decoder.decode(der, asn1Spec=PrivateKeyInfo())
diff --git a/tests/test_oauth2client.py b/tests/test_oauth2client.py
@@ -644,8 +644,8 @@ def test_no_unicode_in_request_params(self):
     http = credentials.authorize(http)
     http.request(u'http://example.com', method=u'GET', headers={u'foo': u'bar'})
     for k, v in six.iteritems(http.headers):
-      self.assertEqual(six.binary_type, type(k))
-      self.assertEqual(six.binary_type, type(v))
+      self.assertEqual(bytes, type(k))
+      self.assertEqual(bytes, type(v))
 
     # Test again with unicode strings that can't simply be converted to ASCII.
     try:
