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