summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Collins <robertc@robertcollins.net>2014-08-22 16:30:50 +1200
committerRobert Collins <robertc@robertcollins.net>2014-08-22 16:30:50 +1200
commit9f9d89ce718463b24cd3910b9a99efb60b3c9e1b (patch)
tree8326ab0899d6e59d17e19533c448ecd0c6dc502f
parentaf81d41d9550562de9f261ae4eb28040b74e1371 (diff)
downloadfixtures-9f9d89ce718463b24cd3910b9a99efb60b3c9e1b.tar.gz
0.3.160.3.16
~~~~~~ CHANGES ------- * Fixed 0.3.15 on Python 2.6 - version info is a plain tuple there. (Robert Collins)
-rw-r--r--NEWS9
-rw-r--r--lib/fixtures/__init__.py2
-rw-r--r--lib/fixtures/_fixtures/monkeypatch.py2
-rwxr-xr-xsetup.py2
4 files changed, 12 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 9682927..bee721d 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,15 @@ fixtures release notes
NEXT
~~~~
+0.3.16
+~~~~~~
+
+CHANGES
+-------
+
+* Fixed 0.3.15 on Python 2.6 - version info is a plain tuple there.
+ (Robert Collins)
+
0.3.15
~~~~~~
diff --git a/lib/fixtures/__init__.py b/lib/fixtures/__init__.py
index 5d8d42c..43925a4 100644
--- a/lib/fixtures/__init__.py
+++ b/lib/fixtures/__init__.py
@@ -36,7 +36,7 @@ Most users will want to look at TestWithFixtures and Fixture, to start with.
# established at this point, and setup.py will use a version of next-$(revno).
# If the releaselevel is 'final', then the tarball will be major.minor.micro.
# Otherwise it is major.minor.micro~$(revno).
-__version__ = (0, 3, 15, 'final', 0)
+__version__ = (0, 3, 16, 'final', 0)
__all__ = [
'ByteStream',
diff --git a/lib/fixtures/_fixtures/monkeypatch.py b/lib/fixtures/_fixtures/monkeypatch.py
index 858c587..bfb7351 100644
--- a/lib/fixtures/_fixtures/monkeypatch.py
+++ b/lib/fixtures/_fixtures/monkeypatch.py
@@ -66,7 +66,7 @@ class MonkeyPatch(Fixture):
self.addCleanup(self._safe_delete, current, attribute)
else:
# Python 2's setattr transforms function into instancemethod
- if (sys.version_info.major == 2 and
+ if (sys.version_info[0] == 2 and
isinstance(current, (type, types.ClassType)) and
isinstance(old_value, types.FunctionType)):
old_value = staticmethod(old_value)
diff --git a/setup.py b/setup.py
index a1a87ee..5b89923 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ import os.path
description = open(os.path.join(os.path.dirname(__file__), 'README'), 'rt').read()
setup(name="fixtures",
- version="0.3.15",
+ version="0.3.16",
description="Fixtures, reusable state for writing clean tests and more.",
keywords="fixture fixtures unittest contextmanager",
long_description=description,