diff --git a/vcsserver/git_lfs/app.py b/vcsserver/git_lfs/app.py --- a/vcsserver/git_lfs/app.py +++ b/vcsserver/git_lfs/app.py @@ -24,7 +24,7 @@ from pyramid.httpexceptions import ( HTTPBadRequest, HTTPNotImplemented, HTTPNotFound, HTTPForbidden, HTTPUnprocessableEntity) -from vcsserver.lib.rc_json import json +from vcsserver.lib.ext_json import json from vcsserver.git_lfs.lib import OidHandler, LFSOidStore from vcsserver.git_lfs.utils import safe_result, get_cython_compat_decorator from vcsserver.str_utils import safe_int diff --git a/vcsserver/git_lfs/tests/test_lfs_app.py b/vcsserver/git_lfs/tests/test_lfs_app.py --- a/vcsserver/git_lfs/tests/test_lfs_app.py +++ b/vcsserver/git_lfs/tests/test_lfs_app.py @@ -19,7 +19,7 @@ import os import pytest from webtest.app import TestApp as WebObTestApp -from vcsserver.lib.rc_json import json +from vcsserver.lib.ext_json import json from vcsserver.str_utils import safe_bytes from vcsserver.git_lfs.app import create_app from vcsserver.git_lfs.lib import LFSOidStore diff --git a/vcsserver/hooks.py b/vcsserver/hooks.py --- a/vcsserver/hooks.py +++ b/vcsserver/hooks.py @@ -31,7 +31,7 @@ from celery import Celery import mercurial.scmutil import mercurial.node -from vcsserver.lib.rc_json import json +from vcsserver.lib.ext_json import json from vcsserver import exceptions, subprocessio, settings from vcsserver.str_utils import ascii_str, safe_str from vcsserver.remote.git_remote import Repository diff --git a/vcsserver/http_main.py b/vcsserver/http_main.py --- a/vcsserver/http_main.py +++ b/vcsserver/http_main.py @@ -37,7 +37,7 @@ from pyramid.wsgi import wsgiapp from pyramid.response import Response from vcsserver.base import BytesEnvelope, BinaryEnvelope -from vcsserver.lib.rc_json import json +from vcsserver.lib.ext_json import json from vcsserver.config.settings_maker import SettingsMaker from vcsserver.str_utils import safe_int from vcsserver.lib.statsd_client import StatsdClient diff --git a/vcsserver/lib/rc_json.py b/vcsserver/lib/ext_json.py rename from vcsserver/lib/rc_json.py rename to vcsserver/lib/ext_json.py diff --git a/vcsserver/pygrack.py b/vcsserver/pygrack.py --- a/vcsserver/pygrack.py +++ b/vcsserver/pygrack.py @@ -25,7 +25,7 @@ import dulwich.protocol from dulwich.protocol import CAPABILITY_SIDE_BAND, CAPABILITY_SIDE_BAND_64K from webob import Request, Response, exc -from vcsserver.lib.rc_json import json +from vcsserver.lib.ext_json import json from vcsserver import hooks, subprocessio from vcsserver.str_utils import ascii_bytes diff --git a/vcsserver/tests/test_hooks.py b/vcsserver/tests/test_hooks.py --- a/vcsserver/tests/test_hooks.py +++ b/vcsserver/tests/test_hooks.py @@ -26,7 +26,7 @@ import mock import pytest from vcsserver.hooks import HooksHttpClient -from vcsserver.lib.rc_json import json +from vcsserver.lib.ext_json import json from vcsserver import hooks