Update references to mock in GitHub tests

sigmavirus24 · sigmavirus24 · commit 1ddbc738fe03 · 2014-05-04T13:54:46.000-05:00
diff --git a/tests/test_github.py b/tests/test_github.py
@@ -1,9 +1,5 @@
 import github3
-try:
-   from unittest.mock import patch, Mock
-except ImportError:
-   from mock import patch, Mock
-from tests.utils import (BaseCase, load)
+from tests.utils import (BaseCase, load, mock)
 
 
 def merge(first, second=None, **kwargs):
@@ -23,7 +19,7 @@ def test_init(self):
 
     def test_context_manager(self):
         with github3.GitHub() as gh:
-            gh.__exit__ = Mock()
+            gh.__exit__ = mock.Mock()
             assert isinstance(gh, github3.GitHub)
 
         gh.__exit__.assert_called()
@@ -95,7 +91,7 @@ def test_create_issue(self):
         assert i is None
         assert self.request.called is False
 
-        with patch.object(github3.GitHub, 'repository') as repo:
+        with mock.patch.object(github3.GitHub, 'repository') as repo:
             repo.return_value = github3.repos.Repository(
                 load('repo'), self.g)
             i = self.g.create_issue('user', 'repo', 'Title')
@@ -128,7 +124,7 @@ def test_delete_key(self):
         self.response(None, 204)
 
         self.login()
-        with patch.object(github3.github.GitHub, 'key') as key:
+        with mock.patch.object(github3.github.GitHub, 'key') as key:
             key.return_value = github3.users.Key(load('key'), self.g)
             assert self.g.delete_key(10) is True
             key.return_value = None
@@ -219,7 +215,7 @@ def test_issue(self):
                  'issues/1')
 
         assert self.g.issue(None, None, 0) is None
-        with patch.object(github3.github.GitHub, 'repository') as repo:
+        with mock.patch.object(github3.github.GitHub, 'repository') as repo:
             repo.return_value = github3.repos.Repository(load('repo'))
             i = self.g.issue('user', 'repo', 1)
 
@@ -318,7 +314,7 @@ def test_iter_followers(self):
 
         self.assertRaises(github3.GitHubError, self.g.iter_followers)
 
-        with patch.object(github3.github.GitHub, 'user') as ghuser:
+        with mock.patch.object(github3.github.GitHub, 'user') as ghuser:
             ghuser.return_value = github3.users.User(load('user'))
             u = next(self.g.iter_followers('sigmavirus24'))
             assert isinstance(u, github3.users.User)
@@ -340,7 +336,7 @@ def test_iter_following(self):
         self.assertRaises(github3.GitHubError, self.g.iter_following)
         assert self.request.called is False
 
-        with patch.object(github3.github.GitHub, 'user') as ghuser:
+        with mock.patch.object(github3.github.GitHub, 'user') as ghuser:
             ghuser.return_value = github3.users.User(load('user'))
             u = next(self.g.iter_following('sigmavirus24'))
             assert isinstance(u, github3.users.User)
@@ -456,7 +452,7 @@ def test_iter_repo_issues(self):
         self.get('https://api.github.com/repos/sigmavirus24/github3.py/'
                  'issues')
 
-        with patch.object(github3.GitHub, 'repository') as repo:
+        with mock.patch.object(github3.GitHub, 'repository') as repo:
             repo.return_value = github3.repos.Repository(load('repo'),
                                                          self.g)
             i = next(self.g.iter_repo_issues('sigmavirus24', 'github3.py'))
@@ -549,7 +545,7 @@ def test_iter_starred(self):
                           github3.repos.Repository)
         self.mock_assertions()
 
-        with patch.object(github3.github.GitHub, 'user') as user:
+        with mock.patch.object(github3.github.GitHub, 'user') as user:
             user.return_value = github3.users.User(load('user'))
             self.get('https://api.github.com/users/sigmavirus24/starred')
             assert isinstance(next(self.g.iter_starred('sigmavirus24')),
@@ -566,7 +562,7 @@ def test_iter_subscriptions(self):
                           github3.repos.Repository)
         self.mock_assertions()
 
-        with patch.object(github3.github.GitHub, 'user') as user:
+        with mock.patch.object(github3.github.GitHub, 'user') as user:
             user.return_value = github3.users.User(load('user'))
             self.get('https://api.github.com/users/sigmavirus24/'
                      'subscriptions')
@@ -666,7 +662,7 @@ def test_pull_request(self):
                  'github3.py/pulls/18')
         pr = None
 
-        with patch.object(github3.github.GitHub, 'repository') as repo:
+        with mock.patch.object(github3.github.GitHub, 'repository') as repo:
             repo.return_value = github3.repos.Repository(load('repo'))
             pr = self.g.pull_request('sigmavirus24', 'github3.py', 18)
 
@@ -769,8 +765,8 @@ def test_update_user(self):
         args = ('Ian Cordasco', 'example@mail.com', 'www.blog.com', 'company',
                 'loc', True, 'bio')
 
-        with patch.object(github3.github.GitHub, 'user') as user:
-            with patch.object(github3.users.User, 'update') as upd:
+        with mock.patch.object(github3.github.GitHub, 'user') as user:
+            with mock.patch.object(github3.users.User, 'update') as upd:
                 user.return_value = github3.users.User(load('user'), self.g)
                 upd.return_value = True
                 assert self.g.update_user(*args)
