Show More
@@ -29,10 +29,10 b' from io import StringIO' | |||||
29 |
|
29 | |||
30 | import simplejson as json |
|
30 | import simplejson as json | |
31 | import msgpack |
|
31 | import msgpack | |
|
32 | import configparser | |||
32 | from pyramid.config import Configurator |
|
33 | from pyramid.config import Configurator | |
33 | from pyramid.settings import asbool, aslist |
|
34 | from pyramid.settings import asbool, aslist | |
34 | from pyramid.wsgi import wsgiapp |
|
35 | from pyramid.wsgi import wsgiapp | |
35 | from pyramid.compat import configparser |
|
|||
36 | from pyramid.response import Response |
|
36 | from pyramid.response import Response | |
37 |
|
37 | |||
38 | from vcsserver.utils import safe_int |
|
38 | from vcsserver.utils import safe_int |
@@ -26,8 +26,6 b' import logging' | |||||
26 | import traceback |
|
26 | import traceback | |
27 | import tempfile |
|
27 | import tempfile | |
28 |
|
28 | |||
29 | from pyramid import compat |
|
|||
30 |
|
||||
31 | log = logging.getLogger(__name__) |
|
29 | log = logging.getLogger(__name__) | |
32 |
|
30 | |||
33 | # NOTE: Any changes should be synced with exc_tracking at rhodecode.lib.exc_tracking |
|
31 | # NOTE: Any changes should be synced with exc_tracking at rhodecode.lib.exc_tracking | |
@@ -77,7 +75,7 b' def _store_exception(exc_id, exc_info, p' | |||||
77 | detailed_tb = getattr(exc_value, '_org_exc_tb', None) |
|
75 | detailed_tb = getattr(exc_value, '_org_exc_tb', None) | |
78 |
|
76 | |||
79 | if detailed_tb: |
|
77 | if detailed_tb: | |
80 |
if isinstance(detailed_tb, |
|
78 | if isinstance(detailed_tb, str): | |
81 | remote_tb = [detailed_tb] |
|
79 | remote_tb = [detailed_tb] | |
82 |
|
80 | |||
83 | tb += ( |
|
81 | tb += ( |
@@ -26,7 +26,7 b' from dogpile.cache.api import CachedValu' | |||||
26 | from dogpile.cache.backends import memory as memory_backend |
|
26 | from dogpile.cache.backends import memory as memory_backend | |
27 | from dogpile.cache.backends import file as file_backend |
|
27 | from dogpile.cache.backends import file as file_backend | |
28 | from dogpile.cache.backends import redis as redis_backend |
|
28 | from dogpile.cache.backends import redis as redis_backend | |
29 |
from dogpile.cache.backends.file import NO_VALUE, |
|
29 | from dogpile.cache.backends.file import NO_VALUE, FileLock | |
30 | from dogpile.cache.util import memoized_property |
|
30 | from dogpile.cache.util import memoized_property | |
31 |
|
31 | |||
32 | from vcsserver.lib.memory_lru_dict import LRUDict, LRUDictDebug |
|
32 | from vcsserver.lib.memory_lru_dict import LRUDict, LRUDictDebug | |
@@ -67,7 +67,7 b' class PickleSerializer(object):' | |||||
67 |
|
67 | |||
68 | def _dumps(self, value, safe=False): |
|
68 | def _dumps(self, value, safe=False): | |
69 | try: |
|
69 | try: | |
70 |
return |
|
70 | return pickle.dumps(value) | |
71 | except Exception: |
|
71 | except Exception: | |
72 | if safe: |
|
72 | if safe: | |
73 | return NO_VALUE |
|
73 | return NO_VALUE | |
@@ -76,7 +76,7 b' class PickleSerializer(object):' | |||||
76 |
|
76 | |||
77 | def _loads(self, value, safe=True): |
|
77 | def _loads(self, value, safe=True): | |
78 | try: |
|
78 | try: | |
79 |
return |
|
79 | return pickle.loads(value) | |
80 | except Exception: |
|
80 | except Exception: | |
81 | if safe: |
|
81 | if safe: | |
82 | return NO_VALUE |
|
82 | return NO_VALUE |
General Comments 0
You need to be logged in to leave comments.
Login now