Fix test issues

Author: gonchik

atlassian/__init__.py

@@ -7,6 +7,7 @@
 from .bitbucket import Bitbucket as Stash
 from .cloud_admin import CloudAdminOrgs, CloudAdminUsers
 from .confluence import Confluence, ConfluenceBase, ConfluenceCloud, ConfluenceServer
+from .confluence.cloud.cloud import ConfluenceCloud as ConfluenceV2
 from .crowd import Crowd
 from .insight import Insight
 from .insight import Insight as Assets  # used for Insight on-premise
@@ -22,13 +23,11 @@
 
 # Confluence REST API v2 client.  The existing ``Confluence`` class remains
 # the backwards-compatible v1/v2 URL-dispatching client.
-ConfluenceV2 = ConfluenceCloud
-
-
 def create_confluence(url, *args, api_version=1, **kwargs):
     """Create a version-aware Confluence client."""
     return ConfluenceBase.factory(url, *args, api_version=api_version, **kwargs)
 
+
 __all__ = [
     "Confluence",
     "ConfluenceBase",

atlassian/confluence/__init__.py

@@ -9,7 +9,6 @@
 
 from ..confluence_base import ConfluenceBase
 from .cloud import Cloud as LegacyConfluenceCloud
-from .cloud.cloud import ConfluenceCloud
 from .server import Server as ConfluenceServer
 from .base import ConfluenceBase as LegacyConfluenceBase
 
@@ -20,10 +19,10 @@ class Confluence(LegacyConfluenceBase):
 
     def __new__(cls, url, *args, **kwargs):
         api_version = kwargs.get("api_version")
-        if api_version in {1, 2}:
-            versioned_kwargs = dict(kwargs)
-            versioned_kwargs.pop("api_version")
-            return ConfluenceBase(url, *args, api_version=api_version, **versioned_kwargs)
+        if api_version in (1, 2):
+            from .cloud.cloud import ConfluenceCloud as VersionedConfluenceCloud
+
+            return VersionedConfluenceCloud(url, *args, **kwargs)
         return super().__new__(cls)
 
     def __init__(self, url, *args, **kwargs):
@@ -58,3 +57,7 @@ def __getattr__(self, attr):
     "ConfluenceServer",
     "ConfluenceBase",
 ]
+
+# ``ConfluenceCloud`` is the established Cloud REST client.  The separate v2
+# implementation is intentionally exported as ``atlassian.ConfluenceV2``.
+ConfluenceCloud = LegacyConfluenceCloud

atlassian/confluence/cloud/__init__.py

@@ -6,7 +6,7 @@
 from atlassian.errors import (
     ApiError,
 )
-from .cloud import ConfluenceCloud
+from .cloud import ConfluenceCloud  # noqa: F401
 
 log = logging.getLogger(__name__)