kallithea Changeset - f522f4d3bf93

Changeset - f522f4d3bf93

Parent rev.

Child rev.

[Not reviewed]

beta

1 8 1

Marcin Kuzminski - 14 years ago 2011-11-11 18:42:10
marcin@python-works.com

moved caching query to libs

9 files changed with 15 insertions and 9 deletions:

rhodecode/lib/caching_query.py

rename

rhodecode/lib/dbmigrate/schema/db_1_2_0.py

rhodecode/lib/utils.py

rhodecode/model/db.py

rhodecode/model/meta.py

rhodecode/model/permission.py

rhodecode/model/repo.py

rhodecode/model/user.py

rhodecode/model/users_group.py

0 comments (0 inline, 0 general)

rhodecode/lib/caching_query.py

➞

Show inline comments

file renamed from rhodecode/model/caching_query.py to rhodecode/lib/caching_query.py

rhodecode/lib/dbmigrate/schema/db_1_2_0.py

➞

Show inline comments

@@ @@ -42,13 +42,13 @@ from vcs.utils.lazy import LazyProperty @@
 from rhodecode.lib import str2bool, safe_str, get_changeset_safe, \
     generate_api_key, safe_unicode
 from rhodecode.lib.exceptions import UsersGroupsAssignedException
 from rhodecode.lib.compat import json
 from rhodecode.model.meta import Base, Session
-from rhodecode.model.caching_query import FromCache
+from rhodecode.lib.caching_query import FromCache
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -40,14 +40,15 @@ from webhelpers.text import collapse, re @@
 from vcs import get_backend
 from vcs.backends.base import BaseChangeset
 from vcs.utils.lazy import LazyProperty
 from vcs.utils.helpers import get_scm
 from vcs.exceptions import VCSError
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model import meta
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import Repository, User, RhodeCodeUi, UserLog, RepoGroup, \
     RhodeCodeSetting
 log = logging.getLogger(__name__)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -41,15 +41,16 @@ from vcs.exceptions import VCSError @@
 from vcs.utils.lazy import LazyProperty
 from rhodecode.lib import str2bool, safe_str, get_changeset_safe, \
     generate_api_key, safe_unicode
 from rhodecode.lib.exceptions import UsersGroupsAssignedException
 from rhodecode.lib.compat import json
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model.meta import Base, Session
-from rhodecode.model.caching_query import FromCache
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES

rhodecode/model/meta.py

➞

Show inline comments

 """SQLAlchemy Metadata and Session object"""
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import scoped_session, sessionmaker
 from beaker import cache
-from rhodecode.model import caching_query
+from rhodecode.lib import caching_query
 # Beaker CacheManager.  A home base for cache configurations.
 cache_manager = cache.CacheManager()
 __all__ = ['Base', 'Session']

rhodecode/model/permission.py

➞

Show inline comments

@@ @@ -25,15 +25,17 @@ @@
 import logging
 import traceback
 from sqlalchemy.exc import DatabaseError
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model import BaseModel
 from rhodecode.model.db import User, Permission, UserToPerm, UserRepoToPerm
-from rhodecode.model.caching_query import FromCache
 log = logging.getLogger(__name__)
 class PermissionModel(BaseModel):
     """Permissions model for RhodeCode

rhodecode/model/repo.py

➞

Show inline comments

@@ @@ -31,15 +31,15 @@ from datetime import datetime @@
 from sqlalchemy.orm import joinedload, make_transient
 from vcs.utils.lazy import LazyProperty
 from vcs.backends import get_backend
 from rhodecode.lib import safe_str
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model import BaseModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import Repository, UserRepoToPerm, User, Permission, \
     Statistics, UsersGroup, UsersGroupRepoToPerm, RhodeCodeUi, RepoGroup
 from rhodecode.model.user import UserModel
 log = logging.getLogger(__name__)

rhodecode/model/user.py

➞

Show inline comments

@@ @@ -26,14 +26,15 @@ @@
 import logging
 import traceback
 from pylons.i18n.translation import _
 from rhodecode.lib import safe_unicode
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model import BaseModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import User, UserRepoToPerm, Repository, Permission, \
     UserToPerm, UsersGroupRepoToPerm, UsersGroupToPerm, UsersGroupMember
 from rhodecode.lib.exceptions import DefaultUserException, \
     UserOwnsReposException
 from sqlalchemy.exc import DatabaseError

rhodecode/model/users_group.py

➞

Show inline comments

@@ @@ -23,14 +23,15 @@ @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 import traceback
 from rhodecode.model import BaseModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model import BaseMode
 from rhodecode.model.db import UsersGroupMember, UsersGroup
 log = logging.getLogger(__name__)
 class UsersGroupModel(BaseModel):

0 comments (0 inline, 0 general)