Merge lp:~jtv/maas/revert-bug-1311433 into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Revert trunk r2277: workaround for bug 1311433 (now properly fixed in Django).

Reverting this code change will save the distro people an unnecessary SRU.

Jeroen

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'src/maasserver/views/combo.py'
--- src/maasserver/views/combo.py	2014-04-25 18:03:38 +0000
+++ src/maasserver/views/combo.py	2014-05-09 20:28:59 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Combo view."""
@@ -16,10 +16,7 @@
     'get_combo_view',
     ]
 
-from functools import (
-    partial,
-    update_wrapper,
-    )
+from functools import partial
 import os
 
 from convoy.combo import (
@@ -79,12 +76,8 @@
     :rtype: callable
     """
     location = get_absolute_location(location)
-    # 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(
+    return 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'):