merge

tests/test_product.py

@@ -186,7 +186,7 @@ class ProductTestCase(unittest.TestCase):
                     [
                         ('name', '=', to_name),
                     ], limit=1)[0])
-                self.assert_(result == self.uom.compute_price(from_uom, 
+                self.assert_(result == self.uom.compute_price(from_uom,
                     price, to_uom))
 
 def suite():

uom.py

@@ -279,7 +279,7 @@ class Uom(ModelSQL, ModelView):
                     process_args(args[i])
                 i += 1
         process_args(args)
-        return super(Uom, self).search(args, offset=offset, limit=limit, 
+        return super(Uom, self).search(args, offset=offset, limit=limit,
                 order=order, count=count,
                 query_string=query_string)