Show More
@@ -54,6 +54,7 b' from rhodecode.translation import _, _pl' | |||
|
54 | 54 | from rhodecode.lib.str_utils import safe_str, safe_int, safe_bytes |
|
55 | 55 | from rhodecode.lib.hash_utils import md5, md5_safe, sha1, sha1_safe |
|
56 | 56 | from rhodecode.lib.type_utils import aslist, str2bool |
|
57 | from functools import reduce | |
|
57 | 58 | |
|
58 | 59 | #TODO: there's no longer safe_unicode, we mock it now, but should remove it |
|
59 | 60 | safe_unicode = safe_str |
@@ -644,7 +645,7 b' def obfuscate_url_pw(engine):' | |||
|
644 | 645 | _url.password = 'XXXXX' |
|
645 | 646 | except Exception: |
|
646 | 647 | pass |
|
647 |
return |
|
|
648 | return str(_url) | |
|
648 | 649 | |
|
649 | 650 | |
|
650 | 651 | def get_server_url(environ): |
@@ -882,7 +883,7 b' def parse_byte_string(size_str):' | |||
|
882 | 883 | |
|
883 | 884 | _parts = match.groups() |
|
884 | 885 | num, type_ = _parts |
|
885 |
return |
|
|
886 | return int(num) * {'mb': 1024*1024, 'kb': 1024}[type_.lower()] | |
|
886 | 887 | |
|
887 | 888 | |
|
888 | 889 | class CachedProperty(object): |
General Comments 0
You need to be logged in to leave comments.
Login now