[PATCH 7/9] py3: max does not accept 'None'

Stephen Finucane stephen.finucane at intel.com
Mon Nov 30 09:10:48 AEDT 2015


max(n, None), where n is a valid number, is valid in Python 2 but not
Python 3. Replace these calls with something that works in both
versions of Python.

Signed-off-by: Stephen Finucane <stephen.finucane at intel.com>
---
 patchwork/views/xmlrpc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patchwork/views/xmlrpc.py b/patchwork/views/xmlrpc.py
index 64909e2..4f8fa6f 100644
--- a/patchwork/views/xmlrpc.py
+++ b/patchwork/views/xmlrpc.py
@@ -278,8 +278,8 @@ def patch_to_dict(obj):
         'submitter': six.text_type(obj.submitter).encode('utf-8'),
         'submitter_id': obj.submitter_id,
         'delegate': six.text_type(obj.delegate).encode('utf-8'),
-        'delegate_id': max(obj.delegate_id, 0),
-        'commit_ref': max(obj.commit_ref, ''),
+        'delegate_id': obj.delegate_id or 0,
+        'commit_ref': obj.commit_ref or '',
     }
 
 
-- 
2.0.0



More information about the Patchwork mailing list