aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatěj Cepl <mcepl@redhat.com>2012-04-24 07:27:20 +0200
committerMatěj Cepl <mcepl@redhat.com>2012-04-24 07:27:20 +0200
commit653699a56f8e3ebfa4f19e098f03bd817beb9680 (patch)
tree5c68d4b8493b49143b84718d0981b97bada4aa62
parent2229c24f95d502ff269deedc6c4b66aa30f8acd1 (diff)
downloadjson_diff-653699a56f8e3ebfa4f19e098f03bd817beb9680.tar.gz
python 2.4 compatibility ... we don't have context managers.1.3.3
-rw-r--r--MANIFEST.in1
-rw-r--r--NEWS.txt11
-rwxr-xr-xjson_diff.py2
-rw-r--r--setup.py6
4 files changed, 15 insertions, 5 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index f2e27b3..cb36ca6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
recursive-include test *.html *.json
+include test/__init__.py
include NEWS.txt
diff --git a/NEWS.txt b/NEWS.txt
index 0e55038..5ab5770 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,7 +1,14 @@
-1.3.1 2012-04-24
+1.3.3 2012-04-24
+ * Grrr, python 2.4 doesn't have context managers
+
+1.3.2 2012-04-24
+ * Include mising test/__init__.py to the distribution to allow
+ tests for packgaging.
+
+1.3.1 2012-04-23
* Back to the past: previous version was not compatible with Python 2.4.
-1.3.0 2012-04-24
+1.3.0 2012-04-23
* Added -o parameter for output to the specified file.
1.2.9 2012-02-13
diff --git a/json_diff.py b/json_diff.py
index fb0808b..d83c6f1 100755
--- a/json_diff.py
+++ b/json_diff.py
@@ -33,7 +33,7 @@ import logging
from optparse import OptionParser
__author__ = "Matěj Cepl"
-__version__ = "1.3.1"
+__version__ = "1.3.3"
logging.basicConfig(format='%(levelname)s:%(funcName)s:%(message)s',
level=logging.INFO)
diff --git a/setup.py b/setup.py
index f1be6d3..5e21d41 100644
--- a/setup.py
+++ b/setup.py
@@ -24,8 +24,10 @@ class RunTests(Command):
def read(fname):
- with open(os.path.join(os.path.dirname(__file__), fname)) as f:
- return "\n" + f.read().replace("\r\n", "\n")
+ f = open(os.path.join(os.path.dirname(__file__), fname))
+ out = "\n" + f.read().replace("\r\n", "\n")
+ f.close()
+ return out
def get_long_description():