Moving devshell module to contrib.

See discussion in #370 for context.
googleapis · Jan 6, 2016 · f4c2406 · f4c2406
1 parent 0f63a7d
commit f4c2406
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/docs/source/oauth2client.contrib.devshell.rst 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
@@ -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
diff --git 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 → oauth2client/contrib/devshell.py b/oauth2client/devshell.py → oauth2client/contrib/devshell.py
diff --git a/tests/test_devshell.py → tests/contrib/test_devshell.py b/tests/test_devshell.py → 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 json
 import os
@@ -25,13 +25,13 @@
 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
 
 
 class TestCredentialInfoResponse(unittest.TestCase):
@@ -66,7 +66,7 @@ def test_constructor_full_list(self):
 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)
@@ -79,10 +79,10 @@ def test_no_newline_in_received_header(self):
         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)