Use built-in map function to simplify some list comprehensions
svn: r16636
This commit is contained in:
@@ -161,12 +161,10 @@ def valid_plugin_version(plugin_version_string):
|
||||
if not isinstance(plugin_version_string, basestring): return False
|
||||
dots = plugin_version_string.count(".")
|
||||
if dots == 1:
|
||||
plugin_version = tuple([int(n) for n in
|
||||
plugin_version_string.split(".", 1)])
|
||||
plugin_version = tuple(map(int, plugin_version_string.split(".", 1)))
|
||||
return plugin_version == VERSION_TUPLE[:2]
|
||||
elif dots == 2:
|
||||
plugin_version = tuple([int(n) for n in
|
||||
plugin_version_string.split(".", 2)])
|
||||
plugin_version = tuple(map(int, plugin_version_string.split(".", 2)))
|
||||
return (plugin_version[:2] == VERSION_TUPLE[:2] and
|
||||
plugin_version <= VERSION_TUPLE)
|
||||
return False
|
||||
|
||||
@@ -84,9 +84,8 @@ def version_str_to_tup(sversion, positions):
|
||||
(1, 2)
|
||||
"""
|
||||
try:
|
||||
tup = tuple(([int(n) for n in
|
||||
sversion.split(".", sversion.count("."))] +
|
||||
[0] * positions)[0:positions])
|
||||
tup = tuple(map(int, sversion.split(".")))
|
||||
tup += (0,) * (positions - len(tup))
|
||||
except:
|
||||
tup = (0,) * positions
|
||||
return tup
|
||||
|
||||
Reference in New Issue
Block a user