Remove usage of os.environ.setdefault.

This is somewhat misleading, since it doesn't change the value of the env. var. in the shell.
googleapis · Aug 11, 2016 · 7d3cdd8 · 7d3cdd8
1 parent 5190fd7
commit 7d3cdd8
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/oauth2client/client.py b/oauth2client/client.py
@@ -99,13 +99,12 @@
 DEFAULT_ENV_NAME = 'UNKNOWN'
 
 # If set to True _get_environment avoid GCE check (_detect_gce_environment)
-NO_GCE_CHECK = os.environ.setdefault('NO_GCE_CHECK', 'False')
+NO_GCE_CHECK = os.getenv('NO_GCE_CHECK', 'False')
 
 # Timeout in seconds to wait for the GCE metadata server when detecting the
 # GCE environment.
 try:
-    GCE_METADATA_TIMEOUT = int(
-        os.environ.setdefault('GCE_METADATA_TIMEOUT', '3'))
+    GCE_METADATA_TIMEOUT = int(os.getenv('GCE_METADATA_TIMEOUT', 3))
 except ValueError:  # pragma: NO COVER
     GCE_METADATA_TIMEOUT = 3