Moving gce module to contrib.

Also fixing a broken import of oauth2client.appengine in
oauth2client.client. This reveals an untested code-path that
could have been found via 100% code coverage.

docs/source/oauth2client.contrib.gce.rst

@@ -0,0 +1,7 @@
+oauth2client.contrib.gce module
+===============================
+
+.. automodule:: oauth2client.contrib.gce
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/oauth2client.contrib.rst

@@ -16,6 +16,7 @@ Submodules
    oauth2client.contrib.appengine
    oauth2client.contrib.django_orm
    oauth2client.contrib.flask_util
+   oauth2client.contrib.gce
    oauth2client.contrib.keyring_storage
    oauth2client.contrib.locked_file
    oauth2client.contrib.multistore_file

docs/source/oauth2client.gce.rst

@@ -1,7 +0,0 @@
-oauth2client.gce module
-=======================
-
-.. automodule:: oauth2client.gce
-    :members:
-    :undoc-members:
-    :show-inheritance:

docs/source/oauth2client.rst

@@ -18,7 +18,6 @@ Submodules
    oauth2client.crypt
    oauth2client.devshell
    oauth2client.file
-   oauth2client.gce
    oauth2client.service_account
    oauth2client.tools
    oauth2client.util

oauth2client/client.py

@@ -1499,13 +1499,13 @@ def _raise_exception_for_reading_json(credential_file,
 
 
 def _get_application_default_credential_GAE():
-    from oauth2client.appengine import AppAssertionCredentials
+    from oauth2client.contrib.appengine import AppAssertionCredentials
 
     return AppAssertionCredentials([])
 
 
 def _get_application_default_credential_GCE():
-    from oauth2client.gce import AppAssertionCredentials
+    from oauth2client.contrib.gce import AppAssertionCredentials
 
     return AppAssertionCredentials([])
 

tests/contrib/test_gce.py

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Tests for oauth2client.gce.
+"""Tests for oauth2client.contrib.gce.
 
-Unit tests for oauth2client.gce.
+Unit tests for oauth2client.contrib.gce.
 """
 
 import json
@@ -27,7 +27,7 @@ from oauth2client._helpers import _to_bytes
 from oauth2client.client import AccessTokenRefreshError
 from oauth2client.client import Credentials
 from oauth2client.client import save_to_well_known_file
-from oauth2client.gce import AppAssertionCredentials
+from oauth2client.contrib.gce import AppAssertionCredentials
 
 
 __author__ = 'jcgregorio@google.com (Joe Gregorio)'