Show More
@@ -59,7 +59,7 b' from rhodecode.lib.vcs.backends.base imp' | |||||
59 | from rhodecode.lib.utils2 import ( |
|
59 | from rhodecode.lib.utils2 import ( | |
60 | str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe, |
|
60 | str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe, | |
61 | time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict, |
|
61 | time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict, | |
62 |
glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time |
|
62 | glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time) | |
63 | from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \ |
|
63 | from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \ | |
64 | JsonRaw |
|
64 | JsonRaw | |
65 | from rhodecode.lib.ext_json import json |
|
65 | from rhodecode.lib.ext_json import json | |
@@ -2830,7 +2830,7 b' class RepoGroup(Base, BaseModel):' | |||||
2830 | from rhodecode.lib.vcs.utils.helpers import parse_datetime |
|
2830 | from rhodecode.lib.vcs.utils.helpers import parse_datetime | |
2831 |
|
2831 | |||
2832 | def repo_groups_and_repos(): |
|
2832 | def repo_groups_and_repos(): | |
2833 |
all_entries = |
|
2833 | all_entries = [] | |
2834 |
|
2834 | |||
2835 | def _get_members(root_gr, pos=0): |
|
2835 | def _get_members(root_gr, pos=0): | |
2836 |
|
2836 |
@@ -59,7 +59,7 b' from rhodecode.lib.vcs.backends.base imp' | |||||
59 | from rhodecode.lib.utils2 import ( |
|
59 | from rhodecode.lib.utils2 import ( | |
60 | str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe, |
|
60 | str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe, | |
61 | time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict, |
|
61 | time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict, | |
62 |
glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time |
|
62 | glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time) | |
63 | from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \ |
|
63 | from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \ | |
64 | JsonRaw |
|
64 | JsonRaw | |
65 | from rhodecode.lib.ext_json import json |
|
65 | from rhodecode.lib.ext_json import json |
@@ -59,7 +59,7 b' from rhodecode.lib.vcs.backends.base imp' | |||||
59 | from rhodecode.lib.utils2 import ( |
|
59 | from rhodecode.lib.utils2 import ( | |
60 | str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe, |
|
60 | str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe, | |
61 | time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict, |
|
61 | time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict, | |
62 |
glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time |
|
62 | glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time) | |
63 | from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \ |
|
63 | from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \ | |
64 | JsonRaw |
|
64 | JsonRaw | |
65 | from rhodecode.lib.ext_json import json |
|
65 | from rhodecode.lib.ext_json import json |
@@ -59,7 +59,7 b' from rhodecode.lib.vcs.backends.base imp' | |||||
59 | from rhodecode.lib.utils2 import ( |
|
59 | from rhodecode.lib.utils2 import ( | |
60 | str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe, |
|
60 | str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe, | |
61 | time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict, |
|
61 | time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict, | |
62 |
glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time |
|
62 | glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time) | |
63 | from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \ |
|
63 | from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \ | |
64 | JsonRaw |
|
64 | JsonRaw | |
65 | from rhodecode.lib.ext_json import json |
|
65 | from rhodecode.lib.ext_json import json |
@@ -780,13 +780,6 b' class AttributeDict(AttributeDictBase):' | |||||
780 | return self.get(attr, None) |
|
780 | return self.get(attr, None) | |
781 |
|
781 | |||
782 |
|
782 | |||
783 | class OrderedDefaultDict(collections.OrderedDict, collections.defaultdict): |
|
|||
784 | def __init__(self, default_factory=None, *args, **kwargs): |
|
|||
785 | # in python3 you can omit the args to super |
|
|||
786 | super(OrderedDefaultDict, self).__init__(*args, **kwargs) |
|
|||
787 | self.default_factory = default_factory |
|
|||
788 |
|
||||
789 |
|
||||
790 | def fix_PATH(os_=None): |
|
783 | def fix_PATH(os_=None): | |
791 | """ |
|
784 | """ | |
792 | Get current active python path, and append it to PATH variable to fix |
|
785 | Get current active python path, and append it to PATH variable to fix |
@@ -60,7 +60,7 b' from rhodecode.lib.vcs.backends.base imp' | |||||
60 | from rhodecode.lib.utils2 import ( |
|
60 | from rhodecode.lib.utils2 import ( | |
61 | str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe, |
|
61 | str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe, | |
62 | time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict, |
|
62 | time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict, | |
63 |
glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time |
|
63 | glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time) | |
64 | from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \ |
|
64 | from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \ | |
65 | JsonRaw |
|
65 | JsonRaw | |
66 | from rhodecode.lib.ext_json import json |
|
66 | from rhodecode.lib.ext_json import json |
General Comments 0
You need to be logged in to leave comments.
Login now