@@ -1 +1,4 @@ -*.pyc \ No newline at end of file +*.pyc +/build +/dist +/django_idmapper.egg-info \ No newline at end of file .gitignore README.rst @@ -1 +1,43 @@ -from models import * \ No newline at end of file +import os.path + +__all__ = ('__version__', '__build__') + +__version__ = (0, 2) + +def _get_git_revision(path): + revision_file = os.path.join(path, 'refs', 'heads', 'master') + if not os.path.exists(revision_file): + return None + fh = open(revision_file, 'r') + try: + return fh.read() + finally: + fh.close() + +def get_revision(): + """ + :returns: Revision number of this branch/checkout, if available. None if + no revision number can be determined. + """ + package_dir = os.path.dirname(__file__) + checkout_dir = os.path.normpath(os.path.join(package_dir, '..')) + path = os.path.join(checkout_dir, '.git') + if os.path.exists(path): + return _get_git_revision(path) + return None + +__build__ = get_revision() + + +def lazy_object(location): + def inner(*args, **kwargs): + parts = location.rsplit('.', 1) + warnings.warn('`idmapper.%s` is deprecated. Please use `%s` instead.' % (parts[1], location), DeprecationWarning) + imp = __import__(parts[0], globals(), locals(), [parts[1]], -1) + func = getattr(imp, parts[1]) + if callable(func): + return func(*args, **kwargs) + return func + return inner + +SharedMemoryModel = lazy_object('idmapper.models.SharedMemoryModel') \ No newline at end of file idmapper/__init__.py idmapper/base.py @@ -7,6 +7,9 @@ class SharedMemoryManager(Manager): # to be a SharedMemoryModel. def get(self, **kwargs): items = kwargs.keys() - if len(items) == 1 and items[0] in ('pk', self.model.pk.attname): - return self.get_cached_instance(kwargs[item[0]]) - super(SharedMemoryManager, self).get(**kwargs) \ No newline at end of file + inst = None + if len(items) == 1 and items[0] in ('pk', self.model._meta.pk.attname): + inst = self.model.get_cached_instance(kwargs[items[0]]) + if inst is None: + inst = super(SharedMemoryManager, self).get(**kwargs) + return inst \ No newline at end of file idmapper/manager.py idmapper/models.py idmapper/tests.py 567d12ee786a3deb1fc47dfe37cc11a9c819b96a David Cramer dcramer@david-cramers-macbook.local http://github.com/dcramer/django-idmapper/commit/610adb1ef218580fc0fe758b258a855af7c460b2 610adb1ef218580fc0fe758b258a855af7c460b2 2009-09-04T19:46:45-07:00 2009-09-04T19:46:45-07:00 Added setuptools f56c79a42b791b6fc7d9201ae1a5a25c7134cb24 David Cramer dcramer@david-cramers-macbook.local