summaryrefslogtreecommitdiff
path: root/routes
diff options
context:
space:
mode:
authorLuke Macken <lmacken@redhat.com>2010-02-28 15:13:34 -0500
committerLuke Macken <lmacken@redhat.com>2010-02-28 15:13:34 -0500
commit75c770d5c7f7bf1ff93b006dd663dd78cd87a14b (patch)
treee80e8ce7980f36e55894a7334ff6042c47589e9d /routes
parent70248103ac63d6a763bf1d8f067d8f3751aa74d9 (diff)
downloadroutes-75c770d5c7f7bf1ff93b006dd663dd78cd87a14b.tar.gz
Remove a ternary operation in the Mapper to get it working on Python 2.4
--HG-- branch : trunk
Diffstat (limited to 'routes')
-rw-r--r--routes/mapper.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/routes/mapper.py b/routes/mapper.py
index bd48c4f..d37a011 100644
--- a/routes/mapper.py
+++ b/routes/mapper.py
@@ -393,7 +393,7 @@ class Mapper(SubMapperParent):
def format_methods(r):
if r.conditions:
method = r.conditions.get('method', '')
- return method if type(method) is str else ', '.join(method)
+ return type(method) is str and method or ', '.join(method)
else:
return ''