Resolve conflicts

Author: gonchik

atlassian/bitbucket/cloud/common/users.py

@@ -7,21 +7,26 @@ def __init__(self, url, data, *args, **kwargs):
 
     @property
     def display_name(self):
+        """ Display name used by Bitbucket Cloud """
         return str(self.get_data("display_name"))
 
     @property
     def nickname(self):
+        """ Username used by Bitbucket Cloud """
         return self.get_data("nickname")
 
     @property
     def account_id(self):
+        """ Account id used by Bitbucket Cloud """
         return self.get_data("account_id")
 
     @property
     def uuid(self):
+        """ User id used by Bitbucket Cloud """
         return self.get_data("uuid")
 
 
+
 class Participant(BitbucketCloudBase):
     ROLE_REVIEWER = "REVIEWER"
     ROLE_PARTICIPANT = "PARTICIPANT"
@@ -63,3 +68,8 @@ def has_approved(self):
     def participated_on(self):
         """Time of last participation."""
         return self.get_time("participated_on")
+
+    @property
+    def avatar(self):
+        """ URL to user avatar on Bitbucket Cloud """
+        return self.get_data("links")["avatar"]["href"]

tests/responses/bitbucket/cloud/2.0/repositories/TestWorkspace1/testrepository1/pullrequests/1/GET

@@ -158,9 +158,7 @@ responses[None] = {
                 "links": {
                     "self": {"href": "users/%7BUser03UUID%7D"},
                     "html": {"href": "https://bitbucket.org/%7BUser03UUID%7D/"},
-                    "avatar": {
-                        "href": "https://secure.gravatar.com/avatar/ad2424dafaasdssaew12232344434432?d=https%3A%2F%2Favatar-management--avatars.us-west-2.prod.public.atl-paas.net%2Finitials%2FU3-0.png"
-                    },
+                    "avatar": {"href": "users/%7BUser03UUID%7D.png"},
                 },
                 "nickname": "User03Nickname",
                 "type": "user",
@@ -241,9 +239,7 @@ responses[None] = {
         "links": {
             "self": {"href": "users/%7BUser03UUID%7D"},
             "html": {"href": "https://bitbucket.org/%7BUser03UUID%7D/"},
-            "avatar": {
-                "href": "https://secure.gravatar.com/avatar/ad2424dafaasdssaew12232344434432?d=https%3A%2F%2Favatar-management--avatars.us-west-2.prod.public.atl-paas.net%2Finitials%2FU3-0.png"
-            },
+            "avatar": {"href": "users/%7BUser03UUID%7D.png"},
         },
         "nickname": "User03Nickname",
         "type": "user",

tests/test_bitbucket_cloud_oo.py

@@ -223,6 +223,7 @@ def test_author(self, tc1):
         assert tc1.author.uuid == "{User03UUID}"
         assert tc1.author.account_id == "User03AccountID"
         assert tc1.author.nickname == "User03Nickname"
+        assert tc1.author.avatar == "users/%7BUser03UUID%7D.png"
 
     def test_participants(self, tc1):
         participants = list(tc1.participants())
@@ -231,10 +232,13 @@ def test_participants(self, tc1):
         p1 = participants[1]
         assert isinstance(p1, Participant)
         assert isinstance(p1.user, User)
+        print(p1)
         assert p1.user.display_name == "User03DisplayName"
         assert p1.user.uuid == "{User03UUID}"
         assert p1.user.account_id == "User03AccountID"
         assert p1.user.nickname == "User03Nickname"
+        assert p1.user.avatar == "users/%7BUser03UUID%7D.png"
+
         assert _datetimetostr(p1.participated_on) == _datetimetostr(datetime(2020, 7, 9, 7, 0, 54, 416331))
         assert p1.is_participant
         assert not p1.is_reviewer