]> git.ozlabs.org Git - patchwork/commitdiff
Order: always set Order.order
authorJeremy Kerr <jk@ozlabs.org>
Tue, 19 Apr 2011 05:09:36 +0000 (13:09 +0800)
committerJeremy Kerr <jk@ozlabs.org>
Tue, 19 Apr 2011 05:09:36 +0000 (13:09 +0800)
If we create an Order objecty with editable = True, we don't initialise
self.order, leading to testsuite failures with django-1.3.

This change always initialises Order.order (and Order.reversed), so we
don't exit the constructor without these initalised.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
apps/patchwork/utils.py

index e41ffb629635f73559fe410b7e18440fa0a878bd..5a8e4c0a4746f700bd201f316db32b0e7519d371 100644 (file)
@@ -49,12 +49,12 @@ class Order(object):
     def __init__(self, str = None, editable = False):
         self.reversed = False
         self.editable = editable
+        (self.order, self.reversed) = self.default_order
 
         if self.editable:
             return
 
         if str is None or str == '':
-            (self.order, self.reversed) = self.default_order
             return
 
         reversed = False
@@ -63,7 +63,6 @@ class Order(object):
             reversed = True
 
         if str not in self.order_map.keys():
-            (self.order, self.reversed) = self.default_order
             return
 
         self.order = str