[BitBucket] Add mockup for the URL response in the test of bitbucket. (#623)

* [BitBucket] Add mockup for the URL response in the test of bitbucket.

* [BitBucket] Fix paged API for second call

Author: Spacetown

.gitignore

@@ -8,6 +8,9 @@ __pycache__/
 *.py[cod]
 *$py.class
 
+# Temporary created when running tox
+atlassian-python-api-*
+
 # C extensions
 *.so
 

Makefile

@@ -37,9 +37,10 @@ tox:
 	tox
 
 docker-qa: export TEST_OPTS := $(TEST_OPTS)
+docker-qa: export PYTHONDONTWRITEBYTECODE := 1
 
 docker-qa: | docker-qa-build
-	docker run --rm -e TEST_OPTS -v `pwd`:/atlassian-python-api $(QA_CONTAINER)
+	docker run --rm -e TEST_OPTS -e PYTHONDONTWRITEBYTECODE -v `pwd`:/atlassian-python-api $(QA_CONTAINER)
 
 docker-qa-build: Dockerfile.qa requirements.txt requirements-dev.txt
 	docker build \

atlassian-python-api.code-workspace

@@ -0,0 +1,16 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"files.exclude": {
+			".mypy_cache": true,
+			".tox": true,
+			"**/__pycache__": true,
+			"**/*.pyc": true,
+			"atlassian_python_api.egg-info": true
+		}
+	}
+}

atlassian/bitbucket/base.py

@@ -30,7 +30,7 @@ def __init__(self, url, *args, **kwargs):
     def __str__(self):
         return PrettyPrinter(indent=4).pformat(self.__data)
 
-    def _get_paged(self, url, params={}, data=None, flags=None, trailing=None, absolute=False):
+    def _get_paged(self, url, params=None, data=None, flags=None, trailing=None, absolute=False):
         """
         Used to get the paged data
         :param url:       The url to retrieve.
@@ -40,6 +40,9 @@ def _get_paged(self, url, params={}, data=None, flags=None, trailing=None, absol
         :return: nothing
         """
 
+        if params is None:
+            params = {}
+
         while True:
             response = self.get(url, trailing=trailing, params=params, data=data, flags=flags, absolute=absolute)
             if "values" not in response:
@@ -70,6 +73,13 @@ def _new_session_args(self):
             api_version=self.api_version,
         )
 
+    def update(self, **kwargs):
+        """
+        Fields not present in the request body are ignored.
+        """
+        self.__data = super(BitbucketBase, self).put(None, data=kwargs)
+        return self
+
     @property
     def data(self):
         return copy.copy(self.__data)

atlassian/bitbucket/cloud/base.py

@@ -15,7 +15,7 @@ def __init__(self, url, *args, **kwargs):
         """
         super(BitbucketCloudBase, self).__init__(url, *args, **kwargs)
 
-    def _get_paged(self, url, params={}, data=None, flags=None, trailing=None, absolute=False):
+    def _get_paged(self, url, params=None, data=None, flags=None, trailing=None, absolute=False):
         """
         Used to get the paged data
         :param url:       The url to retrieve.
@@ -25,6 +25,9 @@ def _get_paged(self, url, params={}, data=None, flags=None, trailing=None, absol
         :return: nothing
         """
 
+        if params is None:
+            params = {}
+
         while True:
             response = super(BitbucketCloudBase, self).get(
                 url,

atlassian/bitbucket/cloud/repositories/branchRestrictions.py

@@ -139,16 +139,11 @@ def groups(self):
     def value(self):
         return self.get_data("value")
 
-    def update(self, **kwargs):
-        """
-        Updates an existing branch restriction rule.
-        Fields not present in the request body are ignored.
-        """
-        self.__data = super(BranchRestriction, self).put(self.url, absolute=True, data=kwargs)
-        return self
-
     def delete(self):
         """
         Deletes the branch restriction
         """
-        return super(BranchRestriction, self).delete(self.url, absolute=True)
+        data = super(BranchRestriction, self).delete(None)
+        if "errors" in data:
+            return
+        return BranchRestriction(data, **self._new_session_args)

atlassian/bitbucket/cloud/repositories/defaultReviewers.py

@@ -12,7 +12,7 @@ def __init__(self, url, *args, **kwargs):
     def _get_object(self, data):
         if "errors" in data:
             return
-        return DefaultReviewer(data, **self._new_session_args)
+        return DefaultReviewer(self.url_joiner(self.url, data["display_name"]), data, **self._new_session_args)
 
     def add(self, user):
         """
@@ -62,7 +62,7 @@ def get(self, user):
         try:
             default_reviewer = self._get_object(super(DefaultReviewers, self).get(user))
         except HTTPError as e:
-            # A 404 indicates that that specified user is not a default reviewer.
+            # A 404 indicates that the specified user is not a default reviewer.
             if not e.response.status_code == 404:
                 # Rethrow the exception
                 raise
@@ -71,8 +71,8 @@ def get(self, user):
 
 
 class DefaultReviewer(BitbucketCloudBase):
-    def __init__(self, data, *args, **kwargs):
-        super(DefaultReviewer, self).__init__(None, *args, data=data, expected_type="user", **kwargs)
+    def __init__(self, url, data, *args, **kwargs):
+        super(DefaultReviewer, self).__init__(url, *args, data=data, expected_type="user", **kwargs)
 
     @property
     def display_name(self):
@@ -94,4 +94,7 @@ def delete(self):
         """
         Deletes the default reviewer
         """
-        return super(DefaultReviewer, self).delete(self.url, absolute=True)
+        data = super(DefaultReviewer, self).delete(None)
+        if "errors" in data:
+            return
+        return DefaultReviewer(self.url, data, **self._new_session_args)

atlassian/bitbucket/cloud/repositories/issues.py

@@ -123,15 +123,11 @@ def edited_on(self):
     def updated_on(self):
         return self.get_data("updated_on", "never updated")
 
-    def update(self, **kwargs):
-        """
-        Update the issue.
-        """
-        self.__data = super(Issue, self).put(self.url, absolute=True, data=kwargs)
-        return self
-
     def delete(self):
         """
         Deletes the issue
         """
-        return super(Issue, self).delete(self.url, absolute=True)
+        data = super(Issue, self).delete(None)
+        if "errors" in data:
+            return
+        return Issue(data, **self._new_session_args)

atlassian/bitbucket/cloud/repositories/pipelines.py

@@ -12,9 +12,7 @@ def __init__(self, url, *args, **kwargs):
     def _get_object(self, data):
         if "errors" in data:
             return
-        # Change the URL to be able to use endpoints below
-        data["links"]["self"]["href"] = self.url_joiner(self.url, data["uuid"])
-        return Pipeline(data, **self._new_session_args)
+        return Pipeline(self.url_joiner(self.url, data["uuid"]), data, **self._new_session_args)
 
     def each(self, q=None, sort=None):
         """
@@ -93,8 +91,8 @@ def trigger(self, branch="master", commit=None, pattern=None, variables=None):
 
 
 class Pipeline(BitbucketCloudBase):
-    def __init__(self, data, *args, **kwargs):
-        super(Pipeline, self).__init__(None, *args, data=data, expected_type="pipeline", **kwargs)
+    def __init__(self, url, data, *args, **kwargs):
+        super(Pipeline, self).__init__(url, *args, data=data, expected_type="pipeline", **kwargs)
 
     def _get_object(self, data):
         if "errors" in data:
@@ -205,7 +203,7 @@ def log(self, start=None, end=None):
         try:
             response = self.get("log", headers=headers, advanced_mode=True)
         except HTTPError as e:
-            # A 404 indicates that that specified user is not a default reviewer.
+            # A 404 indicates that no log is present.
             if not e.response.status_code == 404:
                 # Rethrow the exception
                 raise

atlassian/bitbucket/cloud/workspaces/projects.py

@@ -146,15 +146,8 @@ def updated_on(self):
     def get_avatar(self):
         return self.get(self.get_link("avatar"), absolute=True)
 
-    def update(self, **kwargs):
-        """
-        Update the project
-        """
-        self.__data = super(Project, self).put(self.url, absolute=True, data=kwargs)
-        return self
-
     def delete(self):
         """
         Delete the project
         """
-        return super(Project, self).delete(self.url, absolute=True)
+        return super(Project, self).delete(None)