Allow duplicate abbr if it is None

simonw · Dec 13, 2022 · 94e5c75 · 94e5c75
1 parent 5d17e22
commit 94e5c75
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/datasette/app.py b/datasette/app.py
@@ -443,12 +443,13 @@ async def invoke_startup(self):
                         raise StartupError(
                             "Duplicate permission name: {}".format(p.name)
                         )
-                    if p.abbr in abbrs and p != abbrs[p.abbr]:
+                    if p.abbr and p.abbr in abbrs and p != abbrs[p.abbr]:
                         raise StartupError(
                             "Duplicate permission abbr: {}".format(p.abbr)
                         )
                     names[p.name] = p
-                    abbrs[p.abbr] = p
+                    if p.abbr:
+                        abbrs[p.abbr] = p
                     self.permissions[p.name] = p
         for hook in pm.hook.prepare_jinja2_environment(
             env=self.jinja_env, datasette=self