From: Chris Lamb <lamby@debian.org>
Date: Tue, 27 Oct 2009 09:52:18 +0000 (+0000)
Subject: Merge branch 'master' into deb-src-3.0-sqla
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b8842a27c568841dce63ad16084d33567751505;p=dak

Merge branch 'master' into deb-src-3.0-sqla

* master:
  fix p-u accepts for binary uploads
  Correct logic with detecting default kwarg values vs positional args.
  Wrap __doc__ and func_name in @session_wrapper.
  Avoid circular import when importing daklib.dbconn first.
  Handle arguments with default kwargs in @session_wrapper.
  Add missing "utils" import (used in security conditional)
  No need to assign to a local now that @session_wrapper does the cleanup
  Avoid calling .count(); call .one() and catch the exception.
  Fix Archive.__repr__
  Factor out most common session handling into decorator.
---

0b8842a27c568841dce63ad16084d33567751505