From d13dc93eee88013d660c533bb7da5245ecd61da2 Mon Sep 17 00:00:00 2001
From: Gonchik Tsymzhitov <gonchik.tsymzhitov@atlassiancommunity.com>
Date: Sun, 11 May 2025 22:33:50 +0300
Subject: [PATCH 1/2] Confluence: Prepare dedicated module

---
 atlassian/bamboo.py                                  | 1 +
 atlassian/bitbucket/base.py                          | 2 +-
 atlassian/{confluence.py => confluence/__init___.py} | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename atlassian/{confluence.py => confluence/__init___.py} (99%)

diff --git a/atlassian/bamboo.py b/atlassian/bamboo.py
index 66b60bbaf..a9fa51441 100755
--- a/atlassian/bamboo.py
+++ b/atlassian/bamboo.py
@@ -2,6 +2,7 @@
 import logging
 
 from requests.exceptions import HTTPError
+
 from .rest_client import AtlassianRestAPI
 
 log = logging.getLogger(__name__)
diff --git a/atlassian/bitbucket/base.py b/atlassian/bitbucket/base.py
index 4da72541d..750624076 100644
--- a/atlassian/bitbucket/base.py
+++ b/atlassian/bitbucket/base.py
@@ -3,9 +3,9 @@
 import copy
 import re
 import sys
-
 from datetime import datetime
 from pprint import PrettyPrinter
+
 from ..rest_client import AtlassianRestAPI
 
 RE_TIMEZONE = re.compile(r"(\d{2}):(\d{2})$")
diff --git a/atlassian/confluence.py b/atlassian/confluence/__init___.py
similarity index 99%
rename from atlassian/confluence.py
rename to atlassian/confluence/__init___.py
index e2f856b3e..d72da9e02 100644
--- a/atlassian/confluence.py
+++ b/atlassian/confluence/__init___.py
@@ -13,8 +13,7 @@
 from requests import HTTPError
 
 from atlassian import utils
-
-from .errors import (
+from atlassian.errors import (
     ApiConflictError,
     ApiError,
     ApiNotAcceptable,
@@ -22,7 +21,7 @@
     ApiPermissionError,
     ApiValueError,
 )
-from .rest_client import AtlassianRestAPI
+from atlassian.rest_client import AtlassianRestAPI
 
 log = logging.getLogger(__name__)
 

From c41e576d3403a973261440f7b7ee56eae5d587ba Mon Sep 17 00:00:00 2001
From: Gonchik Tsymzhitov <gonchik.tsymzhitov@atlassiancommunity.com>
Date: Sun, 11 May 2025 22:45:38 +0300
Subject: [PATCH 2/2] Fix tests

---
 atlassian/bitbucket/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/atlassian/bitbucket/__init__.py b/atlassian/bitbucket/__init__.py
index b200f7c76..fa1a24cc0 100644
--- a/atlassian/bitbucket/__init__.py
+++ b/atlassian/bitbucket/__init__.py
@@ -162,7 +162,6 @@ def get_users_info(self, user_filter=None, start=0, limit=25):
             params["filter"] = user_filter
         return self._get_paged(url, params=params)
 
-    
     def get_current_license(self):
         """
         Retrieves details about the current license, as well as the current status of the system with