Show More
@@ -25,7 +25,7 b' from vcsserver.lib.rc_cache.archive_cach' | |||
|
25 | 25 | from vcsserver import exceptions |
|
26 | 26 | from vcsserver.exceptions import NoContentException |
|
27 | 27 | from vcsserver.hgcompat import archival |
|
28 | from vcsserver.str_utils import safe_bytes | |
|
28 | from vcsserver.lib.str_utils import safe_bytes | |
|
29 | 29 | from vcsserver.lib.exc_tracking import format_exc |
|
30 | 30 | log = logging.getLogger(__name__) |
|
31 | 31 |
@@ -24,7 +24,7 b' import logging' | |||
|
24 | 24 | import tempfile |
|
25 | 25 | import logging.config |
|
26 | 26 | |
|
27 | from vcsserver.type_utils import str2bool, aslist | |
|
27 | from vcsserver.lib.type_utils import str2bool, aslist | |
|
28 | 28 | |
|
29 | 29 | log = logging.getLogger(__name__) |
|
30 | 30 |
@@ -27,7 +27,7 b' from pyramid.httpexceptions import (' | |||
|
27 | 27 | from vcsserver.lib.ext_json import json |
|
28 | 28 | from vcsserver.git_lfs.lib import OidHandler, LFSOidStore |
|
29 | 29 | from vcsserver.git_lfs.utils import safe_result, get_cython_compat_decorator |
|
30 | from vcsserver.str_utils import safe_int | |
|
30 | from vcsserver.lib.str_utils import safe_int | |
|
31 | 31 | |
|
32 | 32 | log = logging.getLogger(__name__) |
|
33 | 33 |
@@ -20,7 +20,7 b' import pytest' | |||
|
20 | 20 | from webtest.app import TestApp as WebObTestApp |
|
21 | 21 | |
|
22 | 22 | from vcsserver.lib.ext_json import json |
|
23 | from vcsserver.str_utils import safe_bytes | |
|
23 | from vcsserver.lib.str_utils import safe_bytes | |
|
24 | 24 | from vcsserver.git_lfs.app import create_app |
|
25 | 25 | from vcsserver.git_lfs.lib import LFSOidStore |
|
26 | 26 |
@@ -17,7 +17,7 b'' | |||
|
17 | 17 | |
|
18 | 18 | import os |
|
19 | 19 | import pytest |
|
20 | from vcsserver.str_utils import safe_bytes | |
|
20 | from vcsserver.lib.str_utils import safe_bytes | |
|
21 | 21 | from vcsserver.git_lfs.lib import OidHandler, LFSOidStore |
|
22 | 22 | |
|
23 | 23 |
@@ -24,7 +24,7 b' from mercurial import demandimport' | |||
|
24 | 24 | |
|
25 | 25 | # patch demandimport, due to bug in mercurial when it always triggers |
|
26 | 26 | # demandimport.enable() |
|
27 | from vcsserver.str_utils import safe_bytes | |
|
27 | from vcsserver.lib.str_utils import safe_bytes | |
|
28 | 28 | |
|
29 | 29 | demandimport.enable = lambda *args, **kwargs: 1 |
|
30 | 30 |
@@ -25,7 +25,7 b' import pkg_resources' | |||
|
25 | 25 | |
|
26 | 26 | import vcsserver |
|
27 | 27 | import vcsserver.settings |
|
28 | from vcsserver.str_utils import safe_bytes | |
|
28 | from vcsserver.lib.str_utils import safe_bytes | |
|
29 | 29 | |
|
30 | 30 | log = logging.getLogger(__name__) |
|
31 | 31 |
@@ -33,7 +33,7 b' import mercurial.node' | |||
|
33 | 33 | |
|
34 | 34 | from vcsserver.lib.ext_json import json |
|
35 | 35 | from vcsserver import exceptions, subprocessio, settings |
|
36 | from vcsserver.str_utils import ascii_str, safe_str | |
|
36 | from vcsserver.lib.str_utils import ascii_str, safe_str | |
|
37 | 37 | from vcsserver.remote.git_remote import Repository |
|
38 | 38 | |
|
39 | 39 | celery_app = Celery('__vcsserver__') |
@@ -39,7 +39,7 b' from pyramid.response import Response' | |||
|
39 | 39 | from vcsserver.base import BytesEnvelope, BinaryEnvelope |
|
40 | 40 | from vcsserver.lib.ext_json import json |
|
41 | 41 | from vcsserver.config.settings_maker import SettingsMaker |
|
42 | from vcsserver.str_utils import safe_int | |
|
42 | from vcsserver.lib.str_utils import safe_int | |
|
43 | 43 | from vcsserver.lib.statsd_client import StatsdClient |
|
44 | 44 | from vcsserver.tweens.request_wrapper import get_headers_call_context |
|
45 | 45 |
@@ -20,7 +20,7 b' import logging' | |||
|
20 | 20 | |
|
21 | 21 | from repoze.lru import LRUCache |
|
22 | 22 | |
|
23 | from vcsserver.str_utils import safe_str | |
|
23 | from vcsserver.lib.str_utils import safe_str | |
|
24 | 24 | |
|
25 | 25 | log = logging.getLogger(__name__) |
|
26 | 26 |
@@ -38,8 +38,8 b' from dogpile.cache.backends.file import ' | |||
|
38 | 38 | from dogpile.cache.util import memoized_property |
|
39 | 39 | |
|
40 | 40 | from vcsserver.lib.memory_lru_dict import LRUDict, LRUDictDebug |
|
41 | from vcsserver.str_utils import safe_bytes, safe_str | |
|
42 | from vcsserver.type_utils import str2bool | |
|
41 | from vcsserver.lib.str_utils import safe_bytes, safe_str | |
|
42 | from vcsserver.lib.type_utils import str2bool | |
|
43 | 43 | |
|
44 | 44 | _default_max_size = 1024 |
|
45 | 45 |
@@ -26,8 +26,8 b' from dogpile.cache import CacheRegion' | |||
|
26 | 26 | |
|
27 | 27 | |
|
28 | 28 | from vcsserver.utils import sha1 |
|
29 | from vcsserver.str_utils import safe_bytes | |
|
30 | from vcsserver.type_utils import str2bool # noqa :required by imports from .utils | |
|
29 | from vcsserver.lib.str_utils import safe_bytes | |
|
30 | from vcsserver.lib.type_utils import str2bool # noqa :required by imports from .utils | |
|
31 | 31 | |
|
32 | 32 | from . import region_meta |
|
33 | 33 |
|
1 | NO CONTENT: file renamed from vcsserver/str_utils.py to vcsserver/lib/str_utils.py |
@@ -24,7 +24,7 b' from svn import ra' | |||
|
24 | 24 | |
|
25 | 25 | from mercurial import error |
|
26 | 26 | |
|
27 | from vcsserver.str_utils import safe_bytes | |
|
27 | from vcsserver.lib.str_utils import safe_bytes | |
|
28 | 28 | |
|
29 | 29 | core.svn_config_ensure(None) |
|
30 | 30 | svn_config = core.svn_config_get_config(None) |
|
1 | NO CONTENT: file renamed from vcsserver/type_utils.py to vcsserver/lib/type_utils.py |
@@ -27,7 +27,7 b' from webob import Request, Response, exc' | |||
|
27 | 27 | |
|
28 | 28 | from vcsserver.lib.ext_json import json |
|
29 | 29 | from vcsserver import hooks, subprocessio |
|
30 | from vcsserver.str_utils import ascii_bytes | |
|
30 | from vcsserver.lib.str_utils import ascii_bytes | |
|
31 | 31 | |
|
32 | 32 | |
|
33 | 33 | log = logging.getLogger(__name__) |
@@ -40,7 +40,7 b' from dulwich.repo import Repo as Dulwich' | |||
|
40 | 40 | |
|
41 | 41 | import rhodecode |
|
42 | 42 | from vcsserver import exceptions, settings, subprocessio |
|
43 | from vcsserver.str_utils import safe_str, safe_int, safe_bytes, ascii_bytes, convert_to_str, splitnewlines | |
|
43 | from vcsserver.lib.str_utils import safe_str, safe_int, safe_bytes, ascii_bytes, convert_to_str, splitnewlines | |
|
44 | 44 | from vcsserver.base import RepoFactory, obfuscate_qs, ArchiveNode, store_archive_in_cache, BytesEnvelope, BinaryEnvelope |
|
45 | 45 | from vcsserver.hgcompat import ( |
|
46 | 46 | hg_url as url_parser, httpbasicauthhandler, httpdigestauthhandler) |
@@ -78,7 +78,7 b' from vcsserver.hgcompat import (' | |||
|
78 | 78 | patternmatcher, |
|
79 | 79 | hgext_strip, |
|
80 | 80 | ) |
|
81 | from vcsserver.str_utils import ascii_bytes, ascii_str, safe_str, safe_bytes, convert_to_str | |
|
81 | from vcsserver.lib.str_utils import ascii_bytes, ascii_str, safe_str, safe_bytes, convert_to_str | |
|
82 | 82 | from vcsserver.vcs_base import RemoteBase |
|
83 | 83 | from vcsserver.config import hooks as hooks_config |
|
84 | 84 | from vcsserver.lib.exc_tracking import format_exc |
@@ -47,8 +47,8 b' from vcsserver.base import (' | |||
|
47 | 47 | BinaryEnvelope, |
|
48 | 48 | ) |
|
49 | 49 | from vcsserver.exceptions import NoContentException |
|
50 | from vcsserver.str_utils import safe_str, safe_bytes | |
|
51 | from vcsserver.type_utils import assert_bytes | |
|
50 | from vcsserver.lib.str_utils import safe_str, safe_bytes | |
|
51 | from vcsserver.lib.type_utils import assert_bytes | |
|
52 | 52 | from vcsserver.vcs_base import RemoteBase |
|
53 | 53 | from vcsserver.lib.svnremoterepo import svnremoterepo |
|
54 | 54 |
@@ -27,7 +27,7 b' import mercurial.hgweb.hgweb_mod' | |||
|
27 | 27 | import webob.exc |
|
28 | 28 | |
|
29 | 29 | from vcsserver import pygrack, exceptions, settings, git_lfs |
|
30 | from vcsserver.str_utils import ascii_bytes, safe_bytes | |
|
30 | from vcsserver.lib.str_utils import ascii_bytes, safe_bytes | |
|
31 | 31 | |
|
32 | 32 | log = logging.getLogger(__name__) |
|
33 | 33 |
@@ -28,7 +28,7 b' import logging' | |||
|
28 | 28 | import subprocess |
|
29 | 29 | import threading |
|
30 | 30 | |
|
31 | from vcsserver.str_utils import safe_str | |
|
31 | from vcsserver.lib.str_utils import safe_str | |
|
32 | 32 | |
|
33 | 33 | log = logging.getLogger(__name__) |
|
34 | 34 |
@@ -24,7 +24,7 b' import tempfile' | |||
|
24 | 24 | from vcsserver import hook_utils |
|
25 | 25 | from vcsserver.hook_utils import set_permissions_if_needed, HOOKS_DIR_MODE, HOOKS_FILE_MODE |
|
26 | 26 | from vcsserver.tests.fixture import no_newline_id_generator |
|
27 | from vcsserver.str_utils import safe_bytes | |
|
27 | from vcsserver.lib.str_utils import safe_bytes | |
|
28 | 28 | from vcsserver.utils import AttributeDict |
|
29 | 29 | |
|
30 | 30 |
@@ -26,7 +26,7 b' import webtest' | |||
|
26 | 26 | |
|
27 | 27 | from vcsserver import hooks, pygrack |
|
28 | 28 | |
|
29 | from vcsserver.str_utils import ascii_bytes | |
|
29 | from vcsserver.lib.str_utils import ascii_bytes | |
|
30 | 30 | |
|
31 | 31 | |
|
32 | 32 | @pytest.fixture() |
@@ -25,7 +25,7 b' import pytest' | |||
|
25 | 25 | import webtest |
|
26 | 26 | |
|
27 | 27 | from vcsserver import scm_app |
|
28 | from vcsserver.str_utils import ascii_bytes | |
|
28 | from vcsserver.lib.str_utils import ascii_bytes | |
|
29 | 29 | |
|
30 | 30 | |
|
31 | 31 | def test_hg_does_not_accept_invalid_cmd(tmpdir): |
@@ -22,7 +22,7 b' import sys' | |||
|
22 | 22 | import pytest |
|
23 | 23 | |
|
24 | 24 | from vcsserver import subprocessio |
|
25 | from vcsserver.str_utils import ascii_bytes | |
|
25 | from vcsserver.lib.str_utils import ascii_bytes | |
|
26 | 26 | |
|
27 | 27 | |
|
28 | 28 | class FileLikeObj: # pragma: no cover |
@@ -20,7 +20,7 b' import mock' | |||
|
20 | 20 | import pytest |
|
21 | 21 | import sys |
|
22 | 22 | |
|
23 | from vcsserver.str_utils import ascii_bytes | |
|
23 | from vcsserver.lib.str_utils import ascii_bytes | |
|
24 | 24 | |
|
25 | 25 | |
|
26 | 26 | class MockPopen: |
@@ -16,7 +16,7 b'' | |||
|
16 | 16 | # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
17 | 17 | |
|
18 | 18 | import pytest |
|
19 | from vcsserver.str_utils import ascii_bytes, ascii_str, convert_to_str | |
|
19 | from vcsserver.lib.str_utils import ascii_bytes, ascii_str, convert_to_str | |
|
20 | 20 | |
|
21 | 21 | |
|
22 | 22 | @pytest.mark.parametrize('given, expected', [ |
@@ -19,7 +19,7 b' import wsgiref.simple_server' | |||
|
19 | 19 | import wsgiref.validate |
|
20 | 20 | |
|
21 | 21 | from vcsserver import wsgi_app_caller |
|
22 | from vcsserver.str_utils import ascii_bytes, safe_str | |
|
22 | from vcsserver.lib.str_utils import ascii_bytes, safe_str | |
|
23 | 23 | |
|
24 | 24 | |
|
25 | 25 | @wsgiref.validate.validator |
General Comments 0
You need to be logged in to leave comments.
Login now