Fix conflicting imports (#13561)

srittau · web-flow · commit bc4473db04c3 · 2025-02-28T19:20:35.000+01:00
diff --git a/stubs/icalendar/icalendar/__init__.pyi b/stubs/icalendar/icalendar/__init__.pyi
@@ -1,3 +1,4 @@
+from . import version as version_mod
 from .alarms import (
     Alarms as Alarms,
     AlarmTime as AlarmTime,
@@ -45,12 +46,6 @@ from .prop import (
     vWeekday as vWeekday,
 )
 from .timezone import use_pytz, use_zoneinfo
-from .version import (
-    __version__ as __version__,
-    __version_tuple__ as __version_tuple__,
-    version as version,
-    version_tuple as version_tuple,
-)
 
 __all__ = [
     "Calendar",
@@ -102,3 +97,8 @@ __all__ = [
     "IncompleteAlarmInformation",
     "LocalTimezoneMissing",
 ]
+
+__version__ = version_mod.__version__
+__version_tuple__ = version_mod.__version_tuple__
+version = version_mod.version
+version_tuple = version_mod.version_tuple
diff --git a/stubs/requests/requests/__init__.pyi b/stubs/requests/requests/__init__.pyi
@@ -1,16 +1,4 @@
-from . import packages as packages, utils as utils
-from .__version__ import (
-    __author__ as __author__,
-    __author_email__ as __author_email__,
-    __build__ as __build__,
-    __cake__ as __cake__,
-    __copyright__ as __copyright__,
-    __description__ as __description__,
-    __license__ as __license__,
-    __title__ as __title__,
-    __url__ as __url__,
-    __version__ as __version__,
-)
+from . import __version__ as version_mod, packages as packages, utils as utils
 from .api import (
     delete as delete,
     get as get,
@@ -37,4 +25,15 @@ from .models import PreparedRequest as PreparedRequest, Request as Request, Resp
 from .sessions import Session as Session, session as session
 from .status_codes import codes as codes
 
+__author__ = version_mod.__author__
+__author_email__ = version_mod.__author_email__
+__build__ = version_mod.__build__
+__cake__ = version_mod.__cake__
+__copyright__ = version_mod.__copyright__
+__description__ = version_mod.__description__
+__license__ = version_mod.__license__
+__title__ = version_mod.__title__
+__url__ = version_mod.__url__
+__version__ = version_mod.__version__
+
 def check_compatibility(urllib3_version: str, chardet_version: str | None, charset_normalizer_version: str | None) -> None: ...
