Merge branch 'master' of https://github.com/LaineHerron/mongoengine

Conflicts: tests/test_document.py
2012-08-03 15:08:21 -07:00 · 2012-08-03 15:08:21 -07:00 · 9eebcf7beb
commit 9eebcf7beb
parent ed74477150 dd023edc0f
1 changed files with 2 additions and 0 deletions
--- a/tests/test_document.py
+++ b/tests/test_document.py
@ -40,6 +40,8 @@ class DocumentTest(unittest.TestCase):
    def test_future_warning(self):
        """Add FutureWarning for future allow_inhertiance default change.
        """
+        if (sys.version_info < (2,6,0)):
+            raise SkipTest('catch warnings as errors only available in 2.6+')

        self.warning_list = []
        showwarning_default = warnings.showwarning