PyGithub 2.8.0__tar.gz → 2.8.1__tar.gz

{pygithub-2.8.0/PyGithub.egg-info → pygithub-2.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyGithub
-Version: 2.8.0
+Version: 2.8.1
 Summary: Use the full Github API v3
 Author-email: Vincent Jacques <vincent@vincent-jacques.net>
 Project-URL: Documentation, https://pygithub.readthedocs.io/en/stable/

{pygithub-2.8.0 → pygithub-2.8.1/PyGithub.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyGithub
-Version: 2.8.0
+Version: 2.8.1
 Summary: Use the full Github API v3
 Author-email: Vincent Jacques <vincent@vincent-jacques.net>
 Project-URL: Documentation, https://pygithub.readthedocs.io/en/stable/

{pygithub-2.8.0 → pygithub-2.8.1}/doc/changes.rst

@@ -4,6 +4,13 @@ Change log
 Stable versions
 ~~~~~~~~~~~~~~~
 
+Version 2.8.1 (September 02, 2025)
+----------------------------------
+
+Bug Fixes
+^^^^^^^^^
+* Use default type if known type is not supported (`#3365 <https://github.com/PyGithub/PyGithub/pull/3365>`_) (`40506415 <https://github.com/PyGithub/PyGithub/commit/40506415>`_)
+
 Version 2.8.0 (September 02, 2025)
 ----------------------------------
 

{pygithub-2.8.0 → pygithub-2.8.1}/github/GithubApp.py

@@ -211,7 +211,7 @@ class GithubApp(CompletableGithubObject):
         if "owner" in attributes:  # pragma no branch
             self._owner = self._makeUnionClassAttributeFromTypeKey(
                 "type",
-                "Enterprise",
+                "User",
                 attributes["owner"],
                 (github.NamedUser.NamedUser, "User"),
                 (github.Organization.Organization, "Organization"),

{pygithub-2.8.0 → pygithub-2.8.1}/github/GithubObject.py

@@ -370,13 +370,23 @@ class GithubObject(ABC):
         )
 
     def _makeUnionClassAttributeFromTypeName(
-        self, type_name: str | None, value: Any, *class_and_names: tuple[type[T_gh], str]
+        self, type_name: str | None, fallback_type: str | None, value: Any, *class_and_names: tuple[type[T_gh], str]
     ) -> Attribute[T_gh]:
         if value is None or type_name is None:
             return _ValuedAttribute(None)  # type: ignore
+        fallback_class = None
         for klass, name in class_and_names:
             if type_name == name:
                 return self._makeClassAttribute(klass, value)
+            if fallback_type == name:
+                fallback_class = klass
+        if fallback_type is not None:
+            if fallback_class is None:
+                # this is misconfiguration in PyGithub code, not a user's fault
+                raise ValueError(
+                    f"Fallback type {fallback_type} is not among classes and names: {[name for klass, name in class_and_names]}"
+                )
+            return self._makeClassAttribute(fallback_class, value)
         return _BadAttribute(value, type)  # type: ignore
 
     def _makeUnionClassAttributeFromTypeKey(
@@ -388,7 +398,9 @@ class GithubObject(ABC):
     ) -> Attribute[T_gh]:
         if value is None or not isinstance(value, dict):
             return _ValuedAttribute(None)  # type: ignore
-        return self._makeUnionClassAttributeFromTypeName(value.get(type_key, default_type), value, *class_and_names)
+        return self._makeUnionClassAttributeFromTypeName(
+            value.get(type_key, default_type), default_type, value, *class_and_names
+        )
 
     def _makeUnionClassAttributeFromTypeKeyAndValueKey(
         self,
@@ -401,7 +413,7 @@ class GithubObject(ABC):
         if value is None or not isinstance(value, dict):
             return _ValuedAttribute(None)  # type: ignore
         return self._makeUnionClassAttributeFromTypeName(
-            value.get(type_key, default_type), value.get(value_key), *class_and_names
+            value.get(type_key, default_type), default_type, value.get(value_key), *class_and_names
         )
 
     @staticmethod

{pygithub-2.8.0 → pygithub-2.8.1}/tests/GithubObject.py

@@ -24,8 +24,12 @@
 #                                                                              #
 ################################################################################
 
+from __future__ import annotations
+
 import unittest
 from datetime import datetime, timedelta, timezone
+from typing import Any
+from unittest import mock
 
 import github.Repository
 import github.RepositoryDiscussion
@@ -33,6 +37,8 @@ import github.RepositoryDiscussion
 from . import Framework
 
 gho = Framework.github.GithubObject
+ghusr = Framework.github.NamedUser
+ghorg = Framework.github.Organization
 
 
 class GithubObject(unittest.TestCase):
@@ -52,6 +58,95 @@ class GithubObject(unittest.TestCase):
         self.assertEqual(github.RepositoryDiscussion.RepositoryDiscussion.is_rest(), False)
         self.assertEqual(github.RepositoryDiscussion.RepositoryDiscussion.is_graphql(), True)
 
+    def testMakeUnionClassAttributeFromTypeName(self):
+        req = mock.Mock(is_not_lazy=False)
+        obj = TestingClass(req, {}, {})
+
+        data = {"login": "login"}
+        class_and_names = [(ghusr.NamedUser, "User"), (ghorg.Organization, "Organization")]
+
+        def make(type_name: str | None, fallback_type: str | None = "User"):
+            return obj._makeUnionClassAttributeFromTypeName(type_name, fallback_type, data, *class_and_names)
+
+        none = make(None)
+        usr = make("User")
+        org = make("Organization")
+        unknown = make("Unknown")
+        bad = make("Unknown", None)
+
+        self.assertIsInstance(none, gho._ValuedAttribute)
+        self.assertIsInstance(usr, gho._ValuedAttribute)
+        self.assertIsInstance(org, gho._ValuedAttribute)
+        self.assertIsInstance(unknown, gho._ValuedAttribute)
+        self.assertIsInstance(bad, gho._BadAttribute)
+
+        self.assertIsNone(none.value)
+        self.assertIsInstance(usr.value, ghusr.NamedUser)
+        self.assertIsInstance(org.value, ghorg.Organization)
+        self.assertIsInstance(unknown.value, ghusr.NamedUser)
+
+        self.assertEqual(str(usr.value), 'NamedUser(login="login")')
+        self.assertEqual(str(org.value), 'Organization(login="login")')
+        self.assertEqual(str(unknown.value), 'NamedUser(login="login")')
+
+    def testMakeUnionClassAttributeFromTypeKey(self):
+        req = mock.Mock(is_not_lazy=False)
+        obj = TestingClass(req, {}, {})
+
+        class_and_names = [(ghusr.NamedUser, "User"), (ghorg.Organization, "Organization")]
+
+        def make(data: dict[str, Any]):
+            return obj._makeUnionClassAttributeFromTypeKey("type", "User", data, *class_and_names)
+
+        default = make({"login": "login"})
+        usr = make({"login": "login", "type": "User"})
+        org = make({"login": "login", "type": "Organization"})
+        unknown = make({"login": "login", "type": "Unknown"})
+
+        self.assertIsInstance(default, gho._ValuedAttribute)
+        self.assertIsInstance(usr, gho._ValuedAttribute)
+        self.assertIsInstance(org, gho._ValuedAttribute)
+        self.assertIsInstance(unknown, gho._ValuedAttribute)
+
+        self.assertIsInstance(default.value, ghusr.NamedUser)
+        self.assertIsInstance(usr.value, ghusr.NamedUser)
+        self.assertIsInstance(org.value, ghorg.Organization)
+        self.assertIsInstance(unknown.value, ghusr.NamedUser)
+
+        self.assertEqual(str(default.value), 'NamedUser(login="login")')
+        self.assertEqual(str(usr.value), 'NamedUser(login="login")')
+        self.assertEqual(str(org.value), 'Organization(login="login")')
+        self.assertEqual(str(unknown.value), 'NamedUser(login="login")')
+
+    def testMakeUnionClassAttributeFromTypeKeyAndValueKey(self):
+        req = mock.Mock(is_not_lazy=False)
+        obj = TestingClass(req, {}, {})
+
+        class_and_names = [(ghusr.NamedUser, "User"), (ghorg.Organization, "Organization")]
+
+        def make(data: dict[str, Any]):
+            return obj._makeUnionClassAttributeFromTypeKeyAndValueKey("type", "data", "User", data, *class_and_names)
+
+        default = make({"data": {"login": "login"}})
+        usr = make({"data": {"login": "login"}, "type": "User"})
+        org = make({"data": {"login": "login"}, "type": "Organization"})
+        unknown = make({"data": {"login": "login"}, "type": "Unknown"})
+
+        self.assertIsInstance(default, gho._ValuedAttribute)
+        self.assertIsInstance(usr, gho._ValuedAttribute)
+        self.assertIsInstance(org, gho._ValuedAttribute)
+        self.assertIsInstance(unknown, gho._ValuedAttribute)
+
+        self.assertIsInstance(default.value, ghusr.NamedUser)
+        self.assertIsInstance(usr.value, ghusr.NamedUser)
+        self.assertIsInstance(org.value, ghorg.Organization)
+        self.assertIsInstance(unknown.value, ghusr.NamedUser)
+
+        self.assertEqual(str(default.value), 'NamedUser(login="login")')
+        self.assertEqual(str(usr.value), 'NamedUser(login="login")')
+        self.assertEqual(str(org.value), 'Organization(login="login")')
+        self.assertEqual(str(unknown.value), 'NamedUser(login="login")')
+
     def testMakeDatetimeAttribute(self):
         for value, expected in [
             (None, None),
@@ -145,3 +240,11 @@ class GithubObject(unittest.TestCase):
             self.assertEqual(value, e.exception.actual_value)
             self.assertEqual(int, e.exception.expected_type)
             self.assertIsNone(e.exception.transformation_exception)
+
+
+class TestingClass(gho.NonCompletableGithubObject):
+    def _initAttributes(self) -> None:
+        pass
+
+    def _useAttributes(self, attributes: Any) -> None:
+        pass