Minor cleanup for the added reduce support in the view server.

cmlenz · cmlenz · commit 6a7c786a36f7 · 2008-06-27T11:18:21.000Z
--HG--
extra : convert_revision : svn%3A7a298fb0-333a-0410-83e7-658617cd9cf3/trunk%4078
diff --git a/couchdb/view.py b/couchdb/view.py
@@ -91,7 +91,10 @@ def reduce(*cmd, **kwargs):
         try:
             exec code in {}, globals_
         except Exception, e:
-            return {'error': {'id': 'reduce_compilation_error', 'reason': e.args[0]}}
+            return {'error': {
+                'id': 'reduce_compilation_error',
+                'reason': e.args[0]
+            }}
         err = {'error': {
             'id': 'reduce_compilation_error',
             'reason': 'string must eval to a function (ex: "def(doc): return 1")'
@@ -103,18 +106,18 @@ def reduce(*cmd, **kwargs):
             return err
 
         results = []
-        keys,vals = zip(*args)
-        if(function.func_code.co_argcount == 3):
-            rereduce = kwargs['rereduce'] if kwargs.has_key('rereduce') else False
-            results = function(keys, vals, rereduce)
+        keys, vals = zip(*args)
+        if function.func_code.co_argcount == 3:
+            results = function(keys, vals, kwargs.get('rereduce', False))
         else:
             results = function(keys, vals)
         return [True, [results]]
 
     def rereduce(*cmd):
         reduce(cmd, rereduce=True)
 
-    handlers = {'reset': reset, 'add_fun': add_fun, 'map_doc': map_doc, 'reduce': reduce, 'rereduce': rereduce}
+    handlers = {'reset': reset, 'add_fun': add_fun, 'map_doc': map_doc,
+                'reduce': reduce, 'rereduce': rereduce}
 
     try:
         while True:
