Fixing lint errors. Fixes Issue 244.

Reviewed in https://codereview.appspot.com/7516043/

apiclient/discovery.py

@@ -25,23 +25,30 @@ __all__ = [
     'key2param',
     ]
 
+
+# Standard library imports
 import copy
-import httplib2
+from email.mime.multipart import MIMEMultipart
+from email.mime.nonmultipart import MIMENonMultipart
 import keyword
 import logging
+import mimetypes
 import os
 import re
-import uritemplate
 import urllib
 import urlparse
-import mimeparse
-import mimetypes
 
 try:
   from urlparse import parse_qsl
 except ImportError:
   from cgi import parse_qsl
 
+# Third-party imports
+import httplib2
+import mimeparse
+import uritemplate
+
+# Local imports
 from apiclient.errors import HttpError
 from apiclient.errors import InvalidJsonError
 from apiclient.errors import MediaUploadSizeError
@@ -55,11 +62,10 @@ from apiclient.model import JsonModel
 from apiclient.model import MediaModel
 from apiclient.model import RawModel
 from apiclient.schema import Schemas
-from email.mime.multipart import MIMEMultipart
-from email.mime.nonmultipart import MIMENonMultipart
-from oauth2client.util import positional
-from oauth2client.util import _add_query_parameter
 from oauth2client.anyjson import simplejson
+from oauth2client.util import _add_query_parameter
+from oauth2client.util import positional
+
 
 # The client library requires a version of httplib2 that supports RETRIES.
 httplib2.RETRIES = 1

oauth2client/appengine.py

@@ -26,8 +26,6 @@ import logging
 import os
 import pickle
 import time
-import urllib
-import urlparse
 
 from google.appengine.api import app_identity
 from google.appengine.api import memcache
@@ -57,10 +55,6 @@ try:
 except ImportError:
   ndb = None
 
-try:
-  from urlparse import parse_qsl
-except ImportError:
-  from cgi import parse_qsl
 
 logger = logging.getLogger(__name__)