From 3df982266237fe5ad9380a4a793182fd8951c713 Mon Sep 17 00:00:00 2001 From: Anthony Nemitz Date: Sat, 25 Aug 2012 09:22:37 -0700 Subject: [PATCH 1/3] fixed type in version calculation --- mongoengine/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py index 0ace8f000..af4c4171c 100644 --- a/mongoengine/__init__.py +++ b/mongoengine/__init__.py @@ -18,6 +18,6 @@ def get_version(): if isinstance(VERSION[-1], basestring): return '.'.join(map(str, VERSION[:-1])) + VERSION[-1] - return '.'.join(map(str, VERSIONs)) + return '.'.join(map(str, VERSION)) __version__ = get_version() From c93a0af503e37c36f7ae6467514b3d171b4d6995 Mon Sep 17 00:00:00 2001 From: Anthony Nemitz Date: Sat, 25 Aug 2012 09:47:02 -0700 Subject: [PATCH 2/3] fix for py3 version calc --- mongoengine/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py index af4c4171c..1c8f83227 100644 --- a/mongoengine/__init__.py +++ b/mongoengine/__init__.py @@ -16,7 +16,12 @@ def get_version(): - if isinstance(VERSION[-1], basestring): + def is_string(s): + try: + return isinstance(s, basestring) + except NameError: + return isinstance(s, str) + if is_string(VERSION[-1]): return '.'.join(map(str, VERSION[:-1])) + VERSION[-1] return '.'.join(map(str, VERSION)) From 4182fb4577835fbc713f31207c55bd0c67aa4259 Mon Sep 17 00:00:00 2001 From: Anthony Nemitz Date: Sat, 25 Aug 2012 09:55:44 -0700 Subject: [PATCH 3/3] fix for py3 version calc of setup.py --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index dcdccae32..0525a150f 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,12 @@ def get_version(version_tuple): - if isinstance(version_tuple[-1], basestring): + def is_string(s): + try: + return isinstance(s, basestring) + except NameError: + return isinstance(s, str) + if is_string(version_tuple[-1]): return '.'.join(map(str, version_tuple[:-1])) + version_tuple[-1] return '.'.join(map(str, version_tuple))