Show More
@@ -24,7 +24,7 b' from pyramid.httpexceptions import (' | |||||
24 | HTTPBadRequest, HTTPNotImplemented, HTTPNotFound, HTTPForbidden, |
|
24 | HTTPBadRequest, HTTPNotImplemented, HTTPNotFound, HTTPForbidden, | |
25 | HTTPUnprocessableEntity) |
|
25 | HTTPUnprocessableEntity) | |
26 |
|
26 | |||
27 |
from vcsserver.lib. |
|
27 | from vcsserver.lib.ext_json import json | |
28 | from vcsserver.git_lfs.lib import OidHandler, LFSOidStore |
|
28 | from vcsserver.git_lfs.lib import OidHandler, LFSOidStore | |
29 | from vcsserver.git_lfs.utils import safe_result, get_cython_compat_decorator |
|
29 | from vcsserver.git_lfs.utils import safe_result, get_cython_compat_decorator | |
30 | from vcsserver.str_utils import safe_int |
|
30 | from vcsserver.str_utils import safe_int |
@@ -19,7 +19,7 b' import os' | |||||
19 | import pytest |
|
19 | import pytest | |
20 | from webtest.app import TestApp as WebObTestApp |
|
20 | from webtest.app import TestApp as WebObTestApp | |
21 |
|
21 | |||
22 |
from vcsserver.lib. |
|
22 | from vcsserver.lib.ext_json import json | |
23 | from vcsserver.str_utils import safe_bytes |
|
23 | from vcsserver.str_utils import safe_bytes | |
24 | from vcsserver.git_lfs.app import create_app |
|
24 | from vcsserver.git_lfs.app import create_app | |
25 | from vcsserver.git_lfs.lib import LFSOidStore |
|
25 | from vcsserver.git_lfs.lib import LFSOidStore |
@@ -31,7 +31,7 b' from celery import Celery' | |||||
31 | import mercurial.scmutil |
|
31 | import mercurial.scmutil | |
32 | import mercurial.node |
|
32 | import mercurial.node | |
33 |
|
33 | |||
34 |
from vcsserver.lib. |
|
34 | from vcsserver.lib.ext_json import json | |
35 | from vcsserver import exceptions, subprocessio, settings |
|
35 | from vcsserver import exceptions, subprocessio, settings | |
36 | from vcsserver.str_utils import ascii_str, safe_str |
|
36 | from vcsserver.str_utils import ascii_str, safe_str | |
37 | from vcsserver.remote.git_remote import Repository |
|
37 | from vcsserver.remote.git_remote import Repository |
@@ -37,7 +37,7 b' from pyramid.wsgi import wsgiapp' | |||||
37 | from pyramid.response import Response |
|
37 | from pyramid.response import Response | |
38 |
|
38 | |||
39 | from vcsserver.base import BytesEnvelope, BinaryEnvelope |
|
39 | from vcsserver.base import BytesEnvelope, BinaryEnvelope | |
40 |
from vcsserver.lib. |
|
40 | from vcsserver.lib.ext_json import json | |
41 | from vcsserver.config.settings_maker import SettingsMaker |
|
41 | from vcsserver.config.settings_maker import SettingsMaker | |
42 | from vcsserver.str_utils import safe_int |
|
42 | from vcsserver.str_utils import safe_int | |
43 | from vcsserver.lib.statsd_client import StatsdClient |
|
43 | from vcsserver.lib.statsd_client import StatsdClient |
1 | NO CONTENT: file renamed from vcsserver/lib/rc_json.py to vcsserver/lib/ext_json.py |
|
NO CONTENT: file renamed from vcsserver/lib/rc_json.py to vcsserver/lib/ext_json.py |
@@ -25,7 +25,7 b' import dulwich.protocol' | |||||
25 | from dulwich.protocol import CAPABILITY_SIDE_BAND, CAPABILITY_SIDE_BAND_64K |
|
25 | from dulwich.protocol import CAPABILITY_SIDE_BAND, CAPABILITY_SIDE_BAND_64K | |
26 | from webob import Request, Response, exc |
|
26 | from webob import Request, Response, exc | |
27 |
|
27 | |||
28 |
from vcsserver.lib. |
|
28 | from vcsserver.lib.ext_json import json | |
29 | from vcsserver import hooks, subprocessio |
|
29 | from vcsserver import hooks, subprocessio | |
30 | from vcsserver.str_utils import ascii_bytes |
|
30 | from vcsserver.str_utils import ascii_bytes | |
31 |
|
31 |
@@ -26,7 +26,7 b' import mock' | |||||
26 | import pytest |
|
26 | import pytest | |
27 |
|
27 | |||
28 | from vcsserver.hooks import HooksHttpClient |
|
28 | from vcsserver.hooks import HooksHttpClient | |
29 |
from vcsserver.lib. |
|
29 | from vcsserver.lib.ext_json import json | |
30 | from vcsserver import hooks |
|
30 | from vcsserver import hooks | |
31 |
|
31 | |||
32 |
|
32 |
General Comments 0
You need to be logged in to leave comments.
Login now