6 files changed, 21 insertions, 21 deletions

diff --git a/docs/source/oauth2client.contrib.devshell.rst b/docs/source/oauth2client.contrib.devshell.rst
new file mode 100644
index 0000000..20d5c41
--- /dev/null
+++ b/docs/source/oauth2client.contrib.devshell.rst
@@ -0,0 +1,7 @@
+oauth2client.contrib.devshell module
+====================================
+
+.. automodule:: oauth2client.contrib.devshell
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/source/oauth2client.contrib.rst b/docs/source/oauth2client.contrib.rst
index d04586a..6ef8974 100644
--- a/docs/source/oauth2client.contrib.rst
+++ b/docs/source/oauth2client.contrib.rst
@@ -14,6 +14,7 @@ Submodules
 .. toctree::
 
    oauth2client.contrib.appengine
+   oauth2client.contrib.devshell
    oauth2client.contrib.django_orm
    oauth2client.contrib.flask_util
    oauth2client.contrib.gce
diff --git a/docs/source/oauth2client.devshell.rst b/docs/source/oauth2client.devshell.rst
deleted file mode 100644
index 1861ec6..0000000
--- a/docs/source/oauth2client.devshell.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-oauth2client.devshell module
-============================
-
-.. automodule:: oauth2client.devshell
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/docs/source/oauth2client.rst b/docs/source/oauth2client.rst
index 9e817cd..25d3ce0 100644
--- a/docs/source/oauth2client.rst
+++ b/docs/source/oauth2client.rst
@@ -16,7 +16,6 @@ Submodules
    oauth2client.client
    oauth2client.clientsecrets
    oauth2client.crypt
-   oauth2client.devshell
    oauth2client.file
    oauth2client.service_account
    oauth2client.tools
diff --git a/oauth2client/devshell.py b/oauth2client/contrib/devshell.py
index 662cb70..662cb70 100644
--- a/oauth2client/devshell.py
+++ b/oauth2client/contrib/devshell.py
diff --git a/tests/test_devshell.py b/tests/contrib/test_devshell.py
index d220b4c..8f525e7 100644
--- a/tests/test_devshell.py
+++ b/tests/contrib/test_devshell.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Tests for oauth2client.devshell."""
+"""Tests for oauth2client.contrib.devshell."""
 
 import datetime
 import json
@@ -23,17 +23,17 @@ import unittest
 
 import mock
 
-from oauth2client import devshell
+from oauth2client.contrib import devshell
 from oauth2client._helpers import _from_bytes
 from oauth2client._helpers import _to_bytes
 from oauth2client.client import save_to_well_known_file
-from oauth2client.devshell import _SendRecv
-from oauth2client.devshell import CREDENTIAL_INFO_REQUEST_JSON
-from oauth2client.devshell import CommunicationError
-from oauth2client.devshell import CredentialInfoResponse
-from oauth2client.devshell import DEVSHELL_ENV
-from oauth2client.devshell import DevshellCredentials
-from oauth2client.devshell import NoDevshellServer
+from oauth2client.contrib.devshell import _SendRecv
+from oauth2client.contrib.devshell import CREDENTIAL_INFO_REQUEST_JSON
+from oauth2client.contrib.devshell import CommunicationError
+from oauth2client.contrib.devshell import CredentialInfoResponse
+from oauth2client.contrib.devshell import DEVSHELL_ENV
+from oauth2client.contrib.devshell import DevshellCredentials
+from oauth2client.contrib.devshell import NoDevshellServer
 
 # A dummy value to use for the expires_in field
 # in CredentialInfoResponse.
@@ -82,7 +82,7 @@ class TestCredentialInfoResponse(unittest.TestCase):
 class Test_SendRecv(unittest.TestCase):
 
     def test_port_zero(self):
-        with mock.patch('oauth2client.devshell.os') as os_mod:
+        with mock.patch('oauth2client.contrib.devshell.os') as os_mod:
             os_mod.getenv = mock.MagicMock(name='getenv', return_value=0)
             self.assertRaises(NoDevshellServer, _SendRecv)
             os_mod.getenv.assert_called_once_with(DEVSHELL_ENV, 0)
@@ -95,10 +95,10 @@ class Test_SendRecv(unittest.TestCase):
         sock.recv(6).decode = mock.MagicMock(
             name='decode', return_value=header_without_newline)
 
-        with mock.patch('oauth2client.devshell.os') as os_mod:
+        with mock.patch('oauth2client.contrib.devshell.os') as os_mod:
             os_mod.getenv = mock.MagicMock(name='getenv',
                                            return_value=non_zero_port)
-            with mock.patch('oauth2client.devshell.socket') as socket:
+            with mock.patch('oauth2client.contrib.devshell.socket') as socket:
                 socket.socket = mock.MagicMock(name='socket',
                                                return_value=sock)
                 self.assertRaises(CommunicationError, _SendRecv)
@@ -223,7 +223,7 @@ class DevshellCredentialsTests(unittest.TestCase):
                 NOW + datetime.timedelta(seconds=EXPIRES_IN),
                 creds.token_expiry)
             utcnow.assert_called_once_with()
-            
+
     def test_handles_skipped_fields(self):
         with _AuthReferenceServer('["joe@example.com"]'):
             creds = DevshellCredentials()