diff --git a/vcsserver/http_main.py b/vcsserver/http_main.py --- a/vcsserver/http_main.py +++ b/vcsserver/http_main.py @@ -29,10 +29,10 @@ from io import StringIO import simplejson as json import msgpack +import configparser from pyramid.config import Configurator from pyramid.settings import asbool, aslist from pyramid.wsgi import wsgiapp -from pyramid.compat import configparser from pyramid.response import Response from vcsserver.utils import safe_int diff --git a/vcsserver/lib/exc_tracking.py b/vcsserver/lib/exc_tracking.py --- a/vcsserver/lib/exc_tracking.py +++ b/vcsserver/lib/exc_tracking.py @@ -26,8 +26,6 @@ import logging import traceback import tempfile -from pyramid import compat - log = logging.getLogger(__name__) # NOTE: Any changes should be synced with exc_tracking at rhodecode.lib.exc_tracking @@ -77,7 +75,7 @@ def _store_exception(exc_id, exc_info, p detailed_tb = getattr(exc_value, '_org_exc_tb', None) if detailed_tb: - if isinstance(detailed_tb, compat.string_types): + if isinstance(detailed_tb, str): remote_tb = [detailed_tb] tb += ( diff --git a/vcsserver/lib/rc_cache/backends.py b/vcsserver/lib/rc_cache/backends.py --- a/vcsserver/lib/rc_cache/backends.py +++ b/vcsserver/lib/rc_cache/backends.py @@ -26,7 +26,7 @@ from dogpile.cache.api import CachedValu from dogpile.cache.backends import memory as memory_backend from dogpile.cache.backends import file as file_backend from dogpile.cache.backends import redis as redis_backend -from dogpile.cache.backends.file import NO_VALUE, compat, FileLock +from dogpile.cache.backends.file import NO_VALUE, FileLock from dogpile.cache.util import memoized_property from vcsserver.lib.memory_lru_dict import LRUDict, LRUDictDebug @@ -67,7 +67,7 @@ class PickleSerializer(object): def _dumps(self, value, safe=False): try: - return compat.pickle.dumps(value) + return pickle.dumps(value) except Exception: if safe: return NO_VALUE @@ -76,7 +76,7 @@ class PickleSerializer(object): def _loads(self, value, safe=True): try: - return compat.pickle.loads(value) + return pickle.loads(value) except Exception: if safe: return NO_VALUE