From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 27 Oct 2009 08:49:04 +0000 (+0100)
Subject: Merge commit 'lamby/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=6a0d15c7c9e06d4c310c2376863a9b5b7edee7ca;hp=219b62c7ed60918097f38eeacfb734bc78588696;p=dak.git

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Correct logic with detecting default kwarg values vs positional args.
  Wrap __doc__ and func_name in @session_wrapper.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 3aa7b8e2..f5a19c12 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -64,7 +64,7 @@ def session_wrapper(fn):
         session = kwargs.get('session')
 
         # No session specified as last argument or in kwargs, create one.
-        if session is None or len(args) == len(getargspec(fn)[0]) - 1:
+        if session is None and len(args) <= len(getargspec(fn)[0]) - 1:
             private_transaction = True
             kwargs['session'] = DBConn().session()
 
@@ -75,6 +75,9 @@ def session_wrapper(fn):
                 # We created a session; close it.
                 kwargs['session'].close()
 
+    wrapped.__doc__ = fn.__doc__
+    wrapped.func_name = fn.func_name
+
     return wrapped
 
 ################################################################################