Show More
@@ -24,9 +24,10 b' import logging' | |||
|
24 | 24 | import threading |
|
25 | 25 | |
|
26 | 26 | from beaker.cache import _cache_decorate, cache_regions, region_invalidate |
|
27 | from sqlalchemy.exc import IntegrityError | |
|
27 | 28 | |
|
28 | 29 | from rhodecode.lib.utils import safe_str, md5 |
|
29 |
from rhodecode.model.db import Session, CacheKey |
|
|
30 | from rhodecode.model.db import Session, CacheKey | |
|
30 | 31 | |
|
31 | 32 | log = logging.getLogger(__name__) |
|
32 | 33 |
@@ -24,7 +24,6 b' Database Models for RhodeCode Enterprise' | |||
|
24 | 24 | |
|
25 | 25 | import re |
|
26 | 26 | import os |
|
27 | import sys | |
|
28 | 27 | import time |
|
29 | 28 | import hashlib |
|
30 | 29 | import logging |
@@ -37,29 +36,25 b' import collections' | |||
|
37 | 36 | |
|
38 | 37 | |
|
39 | 38 | from sqlalchemy import * |
|
40 | from sqlalchemy.exc import IntegrityError | |
|
41 | 39 | from sqlalchemy.ext.declarative import declared_attr |
|
42 | 40 | from sqlalchemy.ext.hybrid import hybrid_property |
|
43 | 41 | from sqlalchemy.orm import ( |
|
44 | 42 | relationship, joinedload, class_mapper, validates, aliased) |
|
45 | 43 | from sqlalchemy.sql.expression import true |
|
46 |
from beaker.cache import cache_region |
|
|
44 | from beaker.cache import cache_region | |
|
47 | 45 | from webob.exc import HTTPNotFound |
|
48 | 46 | from zope.cachedescriptors.property import Lazy as LazyProperty |
|
49 | 47 | |
|
50 | 48 | from pylons import url |
|
51 | 49 | from pylons.i18n.translation import lazy_ugettext as _ |
|
52 | 50 | |
|
53 |
from rhodecode.lib.vcs import |
|
|
54 |
from rhodecode.lib.vcs. |
|
|
55 | from rhodecode.lib.vcs.exceptions import VCSError | |
|
56 | from rhodecode.lib.vcs.backends.base import ( | |
|
57 | EmptyCommit, Reference, MergeFailureReason) | |
|
51 | from rhodecode.lib.vcs import get_vcs_instance | |
|
52 | from rhodecode.lib.vcs.backends.base import EmptyCommit, Reference | |
|
58 | 53 | from rhodecode.lib.utils2 import ( |
|
59 |
str2bool, safe_str, get_commit_safe, safe_unicode, |
|
|
54 | str2bool, safe_str, get_commit_safe, safe_unicode, md5_safe, | |
|
60 | 55 | time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict, |
|
61 | 56 | glob2re) |
|
62 |
from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType |
|
|
57 | from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType | |
|
63 | 58 | from rhodecode.lib.ext_json import json |
|
64 | 59 | from rhodecode.lib.caching_query import FromCache |
|
65 | 60 | from rhodecode.lib.encrypt import AESCipher |
General Comments 0
You need to be logged in to leave comments.
Login now