Remove disliked functions - map, filter and reduce

2 files changed, 3 insertions, 6 deletions

diff --git a/openid/yadis/__init__.py b/openid/yadis/__init__.py
index 68a0d44..a163f80 100644
--- a/openid/yadis/__init__.py
+++ b/openid/yadis/__init__.py
@@ -16,7 +16,7 @@ __version__ = '[library version:1.1.0-rc1]'[17:-1]
 
 # Parse the version info
 try:
-    version_info = map(int, __version__.split('.'))
+    version_info = tuple(int(i) for i in __version__.split('.'))
 except ValueError:
     version_info = (None, None, None)
 else:
diff --git a/openid/yadis/xri.py b/openid/yadis/xri.py
index bd3b29e..60e0675 100644
--- a/openid/yadis/xri.py
+++ b/openid/yadis/xri.py
@@ -6,7 +6,6 @@
 """
 
 import re
-from functools import reduce
 
 XRI_AUTHORITIES = ['!', '=', '@', '+', '$', '(']
 
@@ -51,9 +50,7 @@ else:
     ]
 
 
-_escapeme_re = re.compile('[%s]' % (''.join(
-    map(lambda m_n: u'%s-%s' % (unichr(m_n[0]), unichr(m_n[1])),
-        UCSCHAR + IPRIVATE)),))
+_escapeme_re = re.compile('[%s]' % ''.join(u'%s-%s' % (unichr(m_n[0]), unichr(m_n[1])) for m_n in UCSCHAR + IPRIVATE))
 
 
 def identifierScheme(identifier):
@@ -147,7 +144,7 @@ def rootAuthority(xri):
     else:
         # IRI reference.  XXX: Can IRI authorities have segments?
         segments = authority.split('!')
-        segments = reduce(list.__add__, map(lambda s: s.split('*'), segments))
+        segments = [c for s in segments for c in s.split('*')]
         root = segments[0]
 
     return XRI(root)