Clean up doc strings and unused imports
diff --git a/apiclient/discovery.py b/apiclient/discovery.py
index 22cb4e0..bddcef1 100644
--- a/apiclient/discovery.py
+++ b/apiclient/discovery.py
@@ -14,12 +14,10 @@
"""Client for discovery based APIs
-A client library for Google's discovery
-based APIs.
+A client library for Google's discovery based APIs.
"""
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
-
__all__ = [
'build', 'build_from_document'
]
@@ -48,8 +46,9 @@
def key2param(key):
- """
- max-results -> max_results
+ """Converts key names into parameter names.
+
+ For example, converting "max-results" -> "max_results"
"""
result = []
key = list(key)
@@ -106,10 +105,10 @@
resp, content = http.request(requested_url)
service = simplejson.loads(content)
- fn = os.path.join(os.path.dirname(__file__), "contrib",
- serviceName, "future.json")
+ fn = os.path.join(os.path.dirname(__file__), 'contrib',
+ serviceName, 'future.json')
try:
- f = file(fn, "r")
+ f = file(fn, 'r')
future = f.read()
f.close()
except IOError:
@@ -275,9 +274,9 @@
docs = ['A description of how to use this function\n\n']
for arg in argmap.iterkeys():
- required = ""
+ required = ''
if arg in required_params:
- required = " (required)"
+ required = ' (required)'
docs.append('%s - A parameter%s\n' % (arg, required))
setattr(method, '__doc__', ''.join(docs))
@@ -363,7 +362,7 @@
if futureDesc and 'methods' in futureDesc:
for methodName, methodDesc in futureDesc['methods'].iteritems():
if 'next' in methodDesc and methodName in resourceDesc['methods']:
- createNextMethod(Resource, methodName + "_next",
+ createNextMethod(Resource, methodName + '_next',
resourceDesc['methods'][methodName],
methodDesc['next'])
diff --git a/apiclient/http.py b/apiclient/http.py
index 8f64baf..2b35c85 100644
--- a/apiclient/http.py
+++ b/apiclient/http.py
@@ -23,7 +23,7 @@
"""
def __init__(self, http, postproc, uri,
- method="GET",
+ method='GET',
body=None,
headers=None,
methodId=None):
@@ -139,7 +139,7 @@
"""
self.responses = responses
- def __call__(self, http, postproc, uri, method="GET", body=None,
+ def __call__(self, http, postproc, uri, method='GET', body=None,
headers=None, methodId=None):
"""Implements the callable interface that discovery.build() expects
of requestBuilder, which is to build an object compatible with
@@ -169,7 +169,7 @@
self.headers = headers
def request(self, uri,
- method="GET",
+ method='GET',
body=None,
headers=None,
redirections=1,
diff --git a/apiclient/oauth.py b/apiclient/oauth.py
index 68e4300..1cc6cef 100644
--- a/apiclient/oauth.py
+++ b/apiclient/oauth.py
@@ -8,7 +8,6 @@
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
import copy
-import datetime
import httplib2
import logging
import oauth2 as oauth
@@ -18,9 +17,9 @@
from anyjson import simplejson
try:
- from urlparse import parse_qs, parse_qsl
+ from urlparse import parse_qsl
except ImportError:
- from cgi import parse_qs, parse_qsl
+ from cgi import parse_qsl
class Error(Exception):
@@ -137,7 +136,7 @@
req = oauth.Request.from_consumer_and_token(
self.consumer, self.token, http_method=method, http_url=uri)
req.sign_request(signer, self.consumer, self.token)
- if headers == None:
+ if headers is None:
headers = {}
headers.update(req.to_header())
if 'user-agent' in headers:
@@ -210,7 +209,7 @@
resp, content = client.request(uri, 'POST', headers=headers,
body=body)
if resp['status'] != '200':
- logging.error('Failed to retrieve temporary authorization: %s' % content)
+ logging.error('Failed to retrieve temporary authorization: %s', content)
raise RequestError('Invalid response %s.' % resp['status'])
self.request_token = dict(parse_qsl(content))
@@ -247,7 +246,7 @@
uri = _oauth_uri('access', self.discovery, self.params)
resp, content = client.request(uri, 'POST', headers=headers)
if resp['status'] != '200':
- logging.error('Failed to retrieve access token: %s' % content)
+ logging.error('Failed to retrieve access token: %s', content)
raise RequestError('Invalid response %s.' % resp['status'])
oauth_params = dict(parse_qsl(content))