From feafd4ac0140e3d760c51502336a5fdb4ab91665 Mon Sep 17 00:00:00 2001
From: "Jens W. Klein" <jk@kleinundpartner.at>
Date: Sun, 1 May 2022 00:11:18 +0200
Subject: [PATCH] minimal manual overhaul

---
 plone/app/contentlisting/catalog.py    | 11 ++++-------
 plone/app/contentlisting/realobject.py |  7 ++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/plone/app/contentlisting/catalog.py b/plone/app/contentlisting/catalog.py
index 46698e3..c33f298 100644
--- a/plone/app/contentlisting/catalog.py
+++ b/plone/app/contentlisting/catalog.py
@@ -57,8 +57,7 @@ def getDataOrigin(self):
         # the real object.
         if self._cached_realobject is not None:
             return self._cached_realobject
-        else:
-            return self._brain
+        return self._brain
 
     def getObject(self):
         # Get the real, underlying object.
@@ -85,7 +84,7 @@ def uuid(self):
         # content objects might have UID and might not.
         brain_uid = getattr(aq_base(self._brain), "UID", None)
         if brain_uid is not None:
-            return self._brain.UID
+            return brain_uid
         uuid = IUUID(self.getObject(), None)
         if uuid is not None:
             return uuid
@@ -142,8 +141,7 @@ def getUserData(self, username):
         return userdata
 
     def Creator(self):
-        username = self._brain.Creator
-        return username
+        return self._brain.Creator
 
     def Author(self):
         return self.getUserData(self.Creator())
@@ -186,8 +184,7 @@ def Language(self):
         brain_language = getattr(aq_base(self._brain), "Language", None)
         if brain_language is not None:
             return self._brain.Language
-        else:
-            return self.getObject().Language()
+        return self.getObject().Language()
 
     def Rights(self):
         raise NotImplementedError
diff --git a/plone/app/contentlisting/realobject.py b/plone/app/contentlisting/realobject.py
index d7d6c27..0579a5b 100644
--- a/plone/app/contentlisting/realobject.py
+++ b/plone/app/contentlisting/realobject.py
@@ -23,9 +23,7 @@ def __init__(self, obj):
     def __repr__(self):
         return (
             "<plone.app.contentlisting.realobject."
-            "RealContentListingObject instance at {}>".format(
-                self.getPath(),
-            )
+            f"RealContentListingObject instance at {self.getPath()}>"
         )
 
     __str__ = __repr__
@@ -41,8 +39,7 @@ def __getattr__(self, name):
         obj_name = getattr(aq_base(obj), name, MARKER)
         if obj_name is not MARKER:
             return obj_name
-        else:
-            raise AttributeError(name)
+        raise AttributeError(name)
 
     def getObject(self):
         return self._realobject