From 653c4259eebc0f37e1e2b82d5510d5c4c9475f87 Mon Sep 17 00:00:00 2001 From: Ross Lawley Date: Tue, 27 Nov 2012 11:59:34 +0000 Subject: [PATCH] Fixed handling for old style types --- docs/changelog.rst | 4 ++++ mongoengine/__init__.py | 2 +- mongoengine/base.py | 9 ++++----- python-mongoengine.spec | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index aac24c62..7457eeb4 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +Changes in 0.7.7 +================ +- Fix handling for old style _types + Changes in 0.7.6 ================ - Unicode fix for repr (MongoEngine/mongoengine#133) diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py index cdfbfff9..9f1f552f 100644 --- a/mongoengine/__init__.py +++ b/mongoengine/__init__.py @@ -12,7 +12,7 @@ from signals import * __all__ = (document.__all__ + fields.__all__ + connection.__all__ + queryset.__all__ + signals.__all__) -VERSION = (0, 7, 6) +VERSION = (0, 7, 7) def get_version(): diff --git a/mongoengine/base.py b/mongoengine/base.py index fa12e35d..208e0e59 100644 --- a/mongoengine/base.py +++ b/mongoengine/base.py @@ -121,11 +121,10 @@ class ValidationError(AssertionError): def get_document(name): doc = _document_registry.get(name, None) if not doc: - # Possible old style names - end = ".%s" % name - possible_match = [k for k in _document_registry.keys() - if k.endswith(end)] - if len(possible_match) == 1: + # Possible old style name + end = name.split('.')[-1] + possible_match = [k for k in _document_registry.keys() if k == end] + if len(possible_match) == 1 and end != name: doc = _document_registry.get(possible_match.pop(), None) if not doc: raise NotRegistered(""" diff --git a/python-mongoengine.spec b/python-mongoengine.spec index d796f993..9a376ec7 100644 --- a/python-mongoengine.spec +++ b/python-mongoengine.spec @@ -5,7 +5,7 @@ %define srcname mongoengine Name: python-%{srcname} -Version: 0.7.6 +Version: 0.7.7 Release: 1%{?dist} Summary: A Python Document-Object Mapper for working with MongoDB