Use functools.wraps() instead of manipulating __qualname__; use the name

of the top-level function in order to make the function name match in
versions earlier than Python 3.10.

Author: anthony-tuininga

src/oracledb/connect_params.py

@@ -33,6 +33,7 @@
 # more information.
 #------------------------------------------------------------------------------
 
+import functools
 from typing import Type, Union
 
 import oracledb
@@ -261,26 +262,26 @@ def _address_attr(f):
         """
         Helper function used to get address level attributes.
         """
+        @functools.wraps(f)
         def wrapped(self):
             output = []
             for description in self._impl.description_list.descriptions:
                 for address_list in description.address_lists:
                     for address in address_list.addresses:
                         output.append(getattr(address, f.__name__))
             return output if len(output) > 1 else output[0]
-        wrapped.__qualname__ = f.__qualname__
         return wrapped
 
     def _description_attr(f):
         """
         Helper function used to get description level attributes.
         """
+        @functools.wraps(f)
         def wrapped(self):
             output = []
             for description in self._impl.description_list.descriptions:
                 output.append(getattr(description, f.__name__))
             return output if len(output) > 1 else output[0]
-        wrapped.__qualname__ = f.__qualname__
         return wrapped
 
     @property

src/oracledb/connection.py

@@ -30,6 +30,7 @@
 #------------------------------------------------------------------------------
 
 import collections
+import functools
 
 from . import __name__ as MODULE_NAME
 
@@ -987,7 +988,8 @@ def _connection_factory(f):
     class constructor does not check the validity of the supplied keyword
     parameters.
     """
-    def wrapped(dsn: str=None, *,
+    @functools.wraps(f)
+    def connect(dsn: str=None, *,
                 pool: Type["pool_module.ConnectionPool"]=None,
                 conn_class: Type[Connection]=Connection,
                 params: ConnectParams=None,
@@ -996,8 +998,7 @@ def wrapped(dsn: str=None, *,
         if not issubclass(conn_class, Connection):
             errors._raise_err(errors.INVALID_CONN_CLASS)
         return conn_class(dsn=dsn, pool=pool, params=params, **kwargs)
-    wrapped.__qualname__ = f.__qualname__
-    return wrapped
+    return connect
 
 
 @_connection_factory

src/oracledb/pool.py

@@ -29,6 +29,7 @@
 # for creating connection pools.
 #------------------------------------------------------------------------------
 
+import functools
 from typing import Callable, Type
 
 import oracledb
@@ -528,16 +529,16 @@ def _pool_factory(f):
     ConnectionPool class constructor does not check the validity of the
     supplied keyword parameters.
     """
-    def wrapped(dsn: str=None, *,
+    @functools.wraps(f)
+    def create_pool(dsn: str=None, *,
                 pool_class: Type[ConnectionPool]=ConnectionPool,
                 params: PoolParams=None,
                 **kwargs) -> ConnectionPool:
         f(dsn=dsn, pool_class=pool_class, params=params, **kwargs)
         if not issubclass(pool_class, ConnectionPool):
             errors._raise_err(errors.INVALID_POOL_CLASS)
         return pool_class(dsn, params=params, **kwargs)
-    wrapped.__qualname__ = f.__qualname__
-    return wrapped
+    return create_pool
 
 
 @_pool_factory

utils/connect_params_template.py

@@ -31,6 +31,7 @@
 #{{ generated_notice }}
 #------------------------------------------------------------------------------
 
+import functools
 from typing import Type, Union
 
 import oracledb
@@ -54,25 +55,27 @@ def _address_attr(f):
         """
         Helper function used to get address level attributes.
         """
-        def wrapped_func(self):
+        @functools.wraps(f)
+        def wrapped(self):
             output = []
             for description in self._impl.description_list.descriptions:
                 for address_list in description.address_lists:
                     for address in address_list.addresses:
                         output.append(getattr(address, f.__name__))
             return output if len(output) > 1 else output[0]
-        return wrapped_func
+        return wrapped
 
     def _description_attr(f):
         """
         Helper function used to get description level attributes.
         """
-        def wrapped_func(self):
+        @functools.wraps(f)
+        def wrapped(self):
             output = []
             for description in self._impl.description_list.descriptions:
                 output.append(getattr(description, f.__name__))
             return output if len(output) > 1 else output[0]
-        return wrapped_func
+        return wrapped
 
 #{{ properties }}