Merge pull request google#11 from tseaver/scrub-non_optional-gflags

craigcitro · craigcitro · commit e5a5c36e2492 · 2014-11-19T07:13:55.000-08:00
Really make 'gflags' optional.
diff --git a/apitools/base/py/credentials_lib.py b/apitools/base/py/credentials_lib.py
@@ -14,7 +14,11 @@
 import oauth2client.multistore_file
 import oauth2client.tools
 
-import gflags as flags
+try:
+    from gflags import FLAGS
+except ImportError:
+    FLAGS = None
+
 import logging
 
 from apitools.base.py import exceptions
@@ -192,8 +196,8 @@ def CredentialsFromFile(path, client_info):
       client_info['client_id'],
       client_info['user_agent'],
       client_info['scope'])
-  if hasattr(flags.FLAGS, 'auth_local_webserver'):
-    flags.FLAGS.auth_local_webserver = False
+  if hasattr(FLAGS, 'auth_local_webserver'):
+    FLAGS.auth_local_webserver = False
   credentials = credential_store.get()
   if credentials is None or credentials.invalid:
     print 'Generating new OAuth credentials ...'
