Show More
@@ -27,7 +27,7 b' from pyramid.httpexceptions import HTTPF' | |||||
27 | from rhodecode.apps._base import BaseAppView |
|
27 | from rhodecode.apps._base import BaseAppView | |
28 | from rhodecode.lib import helpers as h |
|
28 | from rhodecode.lib import helpers as h | |
29 | from rhodecode.lib.auth import LoginRequired |
|
29 | from rhodecode.lib.auth import LoginRequired | |
30 |
from |
|
30 | from collections import OrderedDict | |
31 | from rhodecode.model.db import UserApiKeys |
|
31 | from rhodecode.model.db import UserApiKeys | |
32 |
|
32 | |||
33 | log = logging.getLogger(__name__) |
|
33 | log = logging.getLogger(__name__) |
@@ -26,7 +26,7 b' import pytest' | |||||
26 | from rhodecode.apps.repository.tests.test_repo_compare import ComparePage |
|
26 | from rhodecode.apps.repository.tests.test_repo_compare import ComparePage | |
27 | from rhodecode.apps.repository.views.repo_files import RepoFilesView |
|
27 | from rhodecode.apps.repository.views.repo_files import RepoFilesView | |
28 | from rhodecode.lib import helpers as h |
|
28 | from rhodecode.lib import helpers as h | |
29 |
from |
|
29 | from collections import OrderedDict | |
30 | from rhodecode.lib.ext_json import json |
|
30 | from rhodecode.lib.ext_json import json | |
31 | from rhodecode.lib.vcs import nodes |
|
31 | from rhodecode.lib.vcs import nodes | |
32 |
|
32 |
@@ -25,7 +25,7 b' import pytest' | |||||
25 |
|
25 | |||
26 | from rhodecode.apps.repository.views.repo_summary import RepoSummaryView |
|
26 | from rhodecode.apps.repository.views.repo_summary import RepoSummaryView | |
27 | from rhodecode.lib import helpers as h |
|
27 | from rhodecode.lib import helpers as h | |
28 |
from |
|
28 | from collections import OrderedDict | |
29 | from rhodecode.lib.utils2 import AttributeDict, safe_str |
|
29 | from rhodecode.lib.utils2 import AttributeDict, safe_str | |
30 | from rhodecode.lib.vcs.exceptions import RepositoryRequirementError |
|
30 | from rhodecode.lib.vcs.exceptions import RepositoryRequirementError | |
31 | from rhodecode.model.db import Repository |
|
31 | from rhodecode.model.db import Repository |
@@ -34,7 +34,7 b' from rhodecode.lib import diffs, codeblo' | |||||
34 | from rhodecode.lib.auth import ( |
|
34 | from rhodecode.lib.auth import ( | |
35 | LoginRequired, HasRepoPermissionAnyDecorator, NotAnonymous, CSRFRequired) |
|
35 | LoginRequired, HasRepoPermissionAnyDecorator, NotAnonymous, CSRFRequired) | |
36 | from rhodecode.lib.ext_json import json |
|
36 | from rhodecode.lib.ext_json import json | |
37 |
from |
|
37 | from collections import OrderedDict | |
38 | from rhodecode.lib.diffs import ( |
|
38 | from rhodecode.lib.diffs import ( | |
39 | cache_diff, load_cached_diff, diff_cache_exist, get_diff_context, |
|
39 | cache_diff, load_cached_diff, diff_cache_exist, get_diff_context, | |
40 | get_diff_whitespace_flag) |
|
40 | get_diff_whitespace_flag) |
@@ -23,7 +23,6 b' import errno' | |||||
23 |
|
23 | |||
24 | from multiprocessing.util import Finalize |
|
24 | from multiprocessing.util import Finalize | |
25 |
|
25 | |||
26 | from rhodecode.lib.compat import kill |
|
|||
27 |
|
26 | |||
28 |
|
27 | |||
29 | class LockHeld(Exception): |
|
28 | class LockHeld(Exception): | |
@@ -92,7 +91,7 b' class DaemonLock(object):' | |||||
92 | # process PID |
|
91 | # process PID | |
93 | if running_pid: |
|
92 | if running_pid: | |
94 | try: |
|
93 | try: | |
95 | kill(running_pid, 0) |
|
94 | os.kill(running_pid, 0) | |
96 | except OSError as exc: |
|
95 | except OSError as exc: | |
97 | if exc.errno in (errno.ESRCH, errno.EPERM): |
|
96 | if exc.errno in (errno.ESRCH, errno.EPERM): | |
98 | print("Lock File is there but" |
|
97 | print("Lock File is there but" |
@@ -28,7 +28,7 b' import re' | |||||
28 |
|
28 | |||
29 | from zope.cachedescriptors.property import Lazy as LazyProperty |
|
29 | from zope.cachedescriptors.property import Lazy as LazyProperty | |
30 |
|
30 | |||
31 |
from |
|
31 | from collections import OrderedDict | |
32 | from rhodecode.lib.datelib import ( |
|
32 | from rhodecode.lib.datelib import ( | |
33 | utcdate_fromtimestamp, makedate, date_astimestamp) |
|
33 | utcdate_fromtimestamp, makedate, date_astimestamp) | |
34 | from rhodecode.lib.utils import safe_unicode, safe_str |
|
34 | from rhodecode.lib.utils import safe_unicode, safe_str |
@@ -29,7 +29,7 b' import urllib.request, urllib.parse, url' | |||||
29 |
|
29 | |||
30 | from zope.cachedescriptors.property import Lazy as LazyProperty |
|
30 | from zope.cachedescriptors.property import Lazy as LazyProperty | |
31 |
|
31 | |||
32 |
from |
|
32 | from collections import OrderedDict | |
33 | from rhodecode.lib.datelib import ( |
|
33 | from rhodecode.lib.datelib import ( | |
34 | date_to_timestamp_plus_offset, utcdate_fromtimestamp, makedate) |
|
34 | date_to_timestamp_plus_offset, utcdate_fromtimestamp, makedate) | |
35 | from rhodecode.lib.utils import safe_unicode, safe_str |
|
35 | from rhodecode.lib.utils import safe_unicode, safe_str |
@@ -28,7 +28,7 b' import urllib.request, urllib.parse, url' | |||||
28 |
|
28 | |||
29 | from zope.cachedescriptors.property import Lazy as LazyProperty |
|
29 | from zope.cachedescriptors.property import Lazy as LazyProperty | |
30 |
|
30 | |||
31 |
from |
|
31 | from collections import OrderedDict | |
32 | from rhodecode.lib.datelib import date_astimestamp |
|
32 | from rhodecode.lib.datelib import date_astimestamp | |
33 | from rhodecode.lib.utils import safe_str, safe_unicode |
|
33 | from rhodecode.lib.utils import safe_str, safe_unicode | |
34 | from rhodecode.lib.utils2 import CachedProperty |
|
34 | from rhodecode.lib.utils2 import CachedProperty |
@@ -38,7 +38,7 b' from rhodecode.lib.vcs.nodes import File' | |||||
38 | from rhodecode.translation import lazy_ugettext |
|
38 | from rhodecode.translation import lazy_ugettext | |
39 | from rhodecode.lib import helpers as h, hooks_utils, diffs |
|
39 | from rhodecode.lib import helpers as h, hooks_utils, diffs | |
40 | from rhodecode.lib import audit_logger |
|
40 | from rhodecode.lib import audit_logger | |
41 |
from |
|
41 | from collections import OrderedDict | |
42 | from rhodecode.lib.hooks_daemon import prepare_callback_daemon |
|
42 | from rhodecode.lib.hooks_daemon import prepare_callback_daemon | |
43 | from rhodecode.lib.markup_renderer import ( |
|
43 | from rhodecode.lib.markup_renderer import ( | |
44 | DEFAULT_COMMENTS_RENDERER, RstTemplateRenderer) |
|
44 | DEFAULT_COMMENTS_RENDERER, RstTemplateRenderer) |
General Comments 0
You need to be logged in to leave comments.
Login now