diff options
Diffstat (limited to 'mastodon')
| -rw-r--r-- | mastodon/Mastodon.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py index 18171e7..2074224 100644 --- a/mastodon/Mastodon.py +++ b/mastodon/Mastodon.py | |||
| @@ -69,14 +69,18 @@ except: | |||
| 69 | 69 | ||
| 70 | def parse_version_string(version_string): | 70 | def parse_version_string(version_string): |
| 71 | """Parses a semver version string, stripping off "rc" stuff if present.""" | 71 | """Parses a semver version string, stripping off "rc" stuff if present.""" |
| 72 | return tuple(int(x) for x in re.findall(r"\d+", version_string))[:3] | 72 | string_parts = version_string.split(".") |
| 73 | 73 | version_parts = ( | |
| 74 | int(re.match("([0-9]*)", string_parts[0]).group(0)), | ||
| 75 | int(re.match("([0-9]*)", string_parts[1]).group(0)), | ||
| 76 | int(re.match("([0-9]*)", string_parts[2]).group(0)) | ||
| 77 | ) | ||
| 78 | return version_parts | ||
| 74 | 79 | ||
| 75 | def max_version(*version_strings): | 80 | def max_version(*version_strings): |
| 76 | """Returns the maximum version of all provided version strings.""" | 81 | """Returns the maximum version of all provided version strings.""" |
| 77 | return max(version_strings, key=parse_version_string) | 82 | return max(version_strings, key=parse_version_string) |
| 78 | 83 | ||
| 79 | |||
| 80 | def api_version(created_ver, last_changed_ver, return_value_ver): | 84 | def api_version(created_ver, last_changed_ver, return_value_ver): |
| 81 | """Version check decorator. Currently only checks Bigger Than.""" | 85 | """Version check decorator. Currently only checks Bigger Than.""" |
| 82 | def api_min_version_decorator(function): | 86 | def api_min_version_decorator(function): |