Merge lp:~jtv/maas/1.5-bug-1311433 into lp:maas/1.5

[Jeroen T. Vermeulen]

Backport trunk r2277: Work around Django failure “AttributeError: 'functools.partial' object has no attribute '__module__'”.

[Jeroen T. Vermeulen (jtv)]

Straight backport. Self-approving.

review: Approve

=== modified file 'src/maasserver/views/combo.py'
--- src/maasserver/views/combo.py	2014-02-05 04:57:33 +0000
+++ src/maasserver/views/combo.py	2014-04-23 03:41:06 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Combo view."""
@@ -16,7 +16,10 @@
     'get_combo_view',
     ]
 
-from functools import partial
+from functools import (
+    partial,
+    update_wrapper,
+    )
 import os
 
 from convoy.combo import (
@@ -76,8 +79,12 @@
     :rtype: callable
     """
     location = get_absolute_location(location)
-    return partial(
+    # Work around bug 1311433: returning a "partial" as a view causes an
+    # AttributeError about a missing __module__ attribute.  The update_wrapper
+    # solves this.
+    partial_view = partial(
         combo_view, location=location, default_redirect=default_redirect)
+    return update_wrapper(partial_view, combo_view)
 
 
 def combo_view(request, location, default_redirect=None, encoding='utf8'):