rollback changes with session and fix typo in condition

Author: gonchik

README.rst

@@ -50,11 +50,15 @@ Here's a short example of how to create a Confluence page:
 .. code-block:: python
 
     from atlassian import Confluence
-
+    import requests
+    # If you want to use a session, you can create it like this:
+    session =  requests.Session()
+    # and pass it to the Confluence constructor
     confluence = Confluence(
         url='http://localhost:8090',
         username='admin',
-        password='admin')
+        password='admin',
+        session=session,)
 
     status = confluence.create_page(
         space='DEMO',
@@ -69,11 +73,14 @@ And here's another example of how to get issues from Jira using JQL Query:
 .. code-block:: python
 
     from atlassian import Jira
+    import requests
 
+    session = requests.Session()
     jira = Jira(
         url='http://localhost:8080',
         username='admin',
-        password='admin')
+        password='admin',
+        session=session)  # Optional: use a session for persistent connections
     JQL = 'project = DEMO AND status IN ("To Do", "In Progress") ORDER BY issuekey'
     data = jira.jql(JQL)
     print(data)
@@ -83,12 +90,14 @@ The traditional jql method is deprecated for Jira Cloud users, as Atlassian has
 .. code-block:: python
 
     from atlassian import Jira
-
+    import requests
+    session = requests.Session()
     jira = Jira(
         url='https://your-jira-instance.atlassian.net',
         username='[email protected]',
         password='your-api-token',
-        cloud=True  # Ensure this is set to True for Jira Cloud
+        cloud=True,  # Ensure this is set to True for Jira Cloud
+        session=session  # Optional: use a session for persistent connections
     )
     JQL = 'project = DEMO AND status IN ("To Do", "In Progress") ORDER BY issuekey'
     # Fetch issues using the new enhanced_jql method
@@ -100,11 +109,14 @@ Also, you can use the Bitbucket module e.g. for getting project list
 .. code-block:: python
 
     from atlassian import Bitbucket
+    import requests
 
+    session= requests.Session()
     bitbucket = Bitbucket(
             url='http://localhost:7990',
             username='admin',
-            password='admin')
+            password='admin',
+            session=session)
 
     data = bitbucket.project_list()
     print(data)
@@ -115,11 +127,12 @@ Example to get your requests:
 .. code-block:: python
 
     from atlassian import ServiceDesk
-
+    import requests
     sd = ServiceDesk(
             url='http://localhost:7990',
             username='admin',
-            password='admin')
+            password='admin',
+            session=requests.Session())
 
     data = sd.get_my_customer_requests()
     print(data)
@@ -129,11 +142,14 @@ Using Insight (CMDB Tool for Jira):
 .. code-block:: python
 
     from atlassian import Insight
+    import requests
 
+    session = requests.Session()
     insight = Insight(
             url='http://localhost:7990',
             username='admin',
-            password='admin')
+            password='admin',
+            session=session)
 
     data = insight.get_object(88)
     print(data)
@@ -144,11 +160,14 @@ Using Xray (Test Management tool for Jira):
 .. code-block:: python
 
     from atlassian import Xray
+    import requests
 
+    session = requests.Session()
     xr = Xray(
            url='http://localhost:7990',
             username='admin',
-            password='admin')
+            password='admin',
+            session=session)
 
     data = xr.get_tests('TEST-001')
     print(data)
@@ -158,10 +177,13 @@ Using Bamboo:
 .. code-block:: python
 
     from atlassian import Bamboo
+    import requests
 
+    session = requests.Session()
     bamboo = Bamboo(
             url='http://localhost:6990/bamboo/',
-            token="<TOKEN>")
+            token="<TOKEN>",
+            session=session)
 
     data = bamboo.get_elastic_configurations()
     print(data)

atlassian/VERSION

@@ -1 +1 @@
-4.0.6
+4.0.7

atlassian/bitbucket/cloud/repositories/refs.py

@@ -122,7 +122,7 @@ def author(self):
         """User object of the author."""
         if self.get_data("author")["type"] == "app_user":
             # If the author is an app user, return an AppUser instance
-            return AppUser(None, self.get_data("author").get("user"), **self._new_session_args)
+            return AppUser(None, self.get_data("author"), **self._new_session_args)
         return User(None, self.get_data("author"))
 
 

atlassian/jira.py

@@ -3560,9 +3560,9 @@ def jql(
         if validate_query is not None:
             params["validateQuery"] = validate_query
         if self.cloud:
-            url = self.resource_url("search")
-        else:
             url = self.resource_url("search/jql")
+        else:
+            url = self.resource_url("search")
         return self.get(url, params=params)
 
     def enhanced_jql(
@@ -3701,10 +3701,10 @@ def jql_get_list_of_tickets(
             params["expand"] = expand
         if validate_query is not None:
             params["validateQuery"] = validate_query
-        if not self.cloud:
-            url = self.resource_url("search")
-        else:
+        if self.cloud:
             url = self.resource_url("search/jql")
+        else:
+            url = self.resource_url("search")
 
         results: List[object] = []
         while True:

atlassian/rest_client.py

@@ -83,7 +83,7 @@ def __init__(
         api_root: str = "rest/api",
         api_version: Union[str, int] = "latest",
         verify_ssl: bool = True,
-        session: Optional[requests.Session] = requests.Session(),
+        session: Optional[requests.Session] = None,
         oauth: Optional[dict] = None,
         oauth2: Optional[dict] = None,
         cookies: Optional[CookieJar] = None,