Merge branch 'master' into typed-dict

Paillat-dev · web-flow · commit 43d218e291aa · 2024-11-15T23:53:35.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -60,6 +60,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2627](https://github.com/Pycord-Development/pycord/issues/2627))
 - Fixed `AttributeError` when sending polls with `PartialWebook`.
   ([#2624](https://github.com/Pycord-Development/pycord/pull/2624))
+- Fixed `AttributeError` when accessing `Member.guild_permissions` for user installed
+  apps. ([#2650](https://github.com/Pycord-Development/pycord/pull/2650))
 
 ### Changed
 
diff --git a/discord/member.py b/discord/member.py
@@ -566,7 +566,8 @@ def roles(self) -> list[Role]:
             role = g.get_role(role_id)
             if role:
                 result.append(role)
-        result.append(g.default_role)
+        if g.default_role:
+            result.append(g.default_role)
         result.sort()
         return result
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools>=62.6,<=75.4.0",
+    "setuptools>=62.6,<=75.5.0",
     "setuptools-scm>=6.2,<=8.1.0",
 ]
 build-backend = "setuptools.build_meta"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`[build-system]`
`2`	`2`	`requires = [`
`3`		`- "setuptools>=62.6,<=75.4.0",`
	`3`	`+ "setuptools>=62.6,<=75.5.0",`
`4`	`4`	`"setuptools-scm>=6.2,<=8.1.0",`
`5`	`5`	`]`
`6`	`6`	`build-backend = "setuptools.build_meta"`