[v4] Remove deprecated objects methods and classes

Gauvain Pocentek · Gauvain Pocentek · commit 8e4b65fc78f4 · 2017-05-24T07:34:00.000+02:00
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
@@ -96,7 +96,6 @@ def __init__(self, url, private_token=None, email=None, password=None,
                                           self._api_version)
 
         self.broadcastmessages = objects.BroadcastMessageManager(self)
-        self.keys = objects.KeyManager(self)
         self.deploykeys = objects.DeployKeyManager(self)
         self.gitlabciymls = objects.GitlabciymlManager(self)
         self.gitignores = objects.GitignoreManager(self)
@@ -112,9 +111,10 @@ def __init__(self, url, private_token=None, email=None, password=None,
         self.sidekiq = objects.SidekiqManager(self)
         self.snippets = objects.SnippetManager(self)
         self.users = objects.UserManager(self)
+        self.todos = objects.TodoManager(self)
         if self._api_version == '3':
+            self.keys = objects.KeyManager(self)
             self.teams = objects.TeamManager(self)
-        self.todos = objects.TodoManager(self)
 
         # build the "submanagers"
         for parent_cls in six.itervalues(vars(objects)):
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
@@ -307,23 +307,6 @@ class BroadcastMessageManager(BaseManager):
     obj_cls = BroadcastMessage
 
 
-class Key(GitlabObject):
-    _url = '/deploy_keys'
-    canGet = 'from_list'
-    canCreate = False
-    canUpdate = False
-    canDelete = False
-
-    def __init__(self, *args, **kwargs):
-        warnings.warn("`Key` is deprecated, use `DeployKey` instead",
-                      DeprecationWarning)
-        super(Key, self).__init__(*args, **kwargs)
-
-
-class KeyManager(BaseManager):
-    obj_cls = Key
-
-
 class DeployKey(GitlabObject):
     _url = '/deploy_keys'
     canGet = 'from_list'
@@ -2047,11 +2030,6 @@ def archive(self, **kwargs):
         raise_error_from_response(r, GitlabCreateError, 201)
         return Project(self.gitlab, r.json()) if r.status_code == 201 else self
 
-    def archive_(self, **kwargs):
-        warnings.warn("`archive_()` is deprecated, use `archive()` instead",
-                      DeprecationWarning)
-        return self.archive(**kwargs)
-
     def unarchive(self, **kwargs):
         """Unarchive a project.
 
@@ -2067,12 +2045,6 @@ def unarchive(self, **kwargs):
         raise_error_from_response(r, GitlabCreateError, 201)
         return Project(self.gitlab, r.json()) if r.status_code == 201 else self
 
-    def unarchive_(self, **kwargs):
-        warnings.warn("`unarchive_()` is deprecated, "
-                      "use `unarchive()` instead",
-                      DeprecationWarning)
-        return self.unarchive(**kwargs)
-
     def share(self, group_id, group_access, **kwargs):
         """Share the project with a group.
 
