[Python-modules-commits] r16109 - in packages/objgraph/tags (7 files)
stefanor at users.alioth.debian.org
stefanor at users.alioth.debian.org
Sat Mar 12 15:31:37 UTC 2011
Date: Saturday, March 12, 2011 @ 15:31:35
Author: stefanor
Revision: 16109
[svn-buildpackage] Tagging objgraph 1.7.0-1
Added:
packages/objgraph/tags/1.7.0-1/
packages/objgraph/tags/1.7.0-1/debian/changelog
(from rev 16108, packages/objgraph/trunk/debian/changelog)
packages/objgraph/tags/1.7.0-1/debian/patches/quoting-py3k-utf8.patch
(from rev 16107, packages/objgraph/trunk/debian/patches/quoting-py3k-utf8.patch)
packages/objgraph/tags/1.7.0-1/debian/patches/utf8-changes.patch
(from rev 16107, packages/objgraph/trunk/debian/patches/utf8-changes.patch)
Deleted:
packages/objgraph/tags/1.7.0-1/debian/changelog
packages/objgraph/tags/1.7.0-1/debian/patches/quoting-py3k-utf8.patch
packages/objgraph/tags/1.7.0-1/debian/patches/utf8-changes.patch
Deleted: packages/objgraph/tags/1.7.0-1/debian/changelog
===================================================================
--- packages/objgraph/trunk/debian/changelog 2011-03-11 21:51:32 UTC (rev 16106)
+++ packages/objgraph/tags/1.7.0-1/debian/changelog 2011-03-12 15:31:35 UTC (rev 16109)
@@ -1,60 +0,0 @@
-objgraph (1.7.0-1) UNRELEASED; urgency=low
-
- * New upstream release.
- - Update copyright years.
- - utf8-changes.patch: Fix UnicodeDecodeError in non-UTF-8 locales
- - quoting-py3k-utf8.patch: Fix quoting.txt test for Py3k + non-UTF-8
- locales
- * Update my e-mail address.
- * Correct DEP3 headers (first line of Description is the subject)
-
- -- Stefano Rivera <stefanor at debian.org> Fri, 11 Mar 2011 18:41:55 +0200
-
-objgraph (1.6.0-2) unstable; urgency=low
-
- * New binary package: python-objgraph-doc
-
- -- Stefano Rivera <stefano at rivera.za.net> Sat, 18 Dec 2010 22:30:32 +0200
-
-objgraph (1.6.0-1) unstable; urgency=low
-
- * New upstream release.
- - Adds Python 3.x support (LP: #687601)
- * Refresh patches.
- * Use upstream example images, rather than re-generating. (LP: #686731)
-
- -- Stefano Rivera <stefano at rivera.za.net> Sat, 18 Dec 2010 16:35:11 +0200
-
-objgraph (1.5.0-1) unstable; urgency=low
-
- * New upstream release
- * Refresh patches.
- * debian/control: Reword description.
- * Build new Sphinx-based documentation
-
- -- Stefano Rivera <stefano at rivera.za.net> Wed, 08 Dec 2010 00:13:12 +0200
-
-objgraph (1.4.0-1) experimental; urgency=low
-
- * New upstream release.
- - Drop README.Debian: Upstream fixed the issues we were warning about.
- - Extend copyright years.
- - Add examples: examples.txt and finalizers.png
- * Convert from python-support to dh_python2.
- * Use debhelper's --buildsystem=python_distutils option instead of removing
- Makefile in clean.
- * debian/control:
- - Bump Standards-Version to 3.9.1 (no changes needed).
- - Suggest: xdot (now packaged)
- * Patches:
- - Dropped dont-call-xdot.patch: Now builds and runs with or without an
- xdot in PATH.
- - Refreshed Patches.
-
- -- Stefano Rivera <stefano at rivera.za.net> Mon, 08 Nov 2010 02:22:13 +0200
-
-objgraph (1.2-1) unstable; urgency=low
-
- * Initial release (Closes: #566798)
-
- -- Stefano Rivera <stefano at rivera.za.net> Thu, 28 Jan 2010 13:00:22 +0200
Copied: packages/objgraph/tags/1.7.0-1/debian/changelog (from rev 16108, packages/objgraph/trunk/debian/changelog)
===================================================================
--- packages/objgraph/tags/1.7.0-1/debian/changelog (rev 0)
+++ packages/objgraph/tags/1.7.0-1/debian/changelog 2011-03-12 15:31:35 UTC (rev 16109)
@@ -0,0 +1,60 @@
+objgraph (1.7.0-1) unstable; urgency=low
+
+ * New upstream release.
+ - Update copyright years.
+ - utf8-changes.patch: Fix UnicodeDecodeError in non-UTF-8 locales
+ - quoting-py3k-utf8.patch: Fix quoting.txt test for Py3k + non-UTF-8
+ locales
+ * Update my e-mail address.
+ * Correct DEP3 headers (first line of Description is the subject)
+
+ -- Stefano Rivera <stefanor at debian.org> Sat, 12 Mar 2011 17:25:37 +0200
+
+objgraph (1.6.0-2) unstable; urgency=low
+
+ * New binary package: python-objgraph-doc
+
+ -- Stefano Rivera <stefano at rivera.za.net> Sat, 18 Dec 2010 22:30:32 +0200
+
+objgraph (1.6.0-1) unstable; urgency=low
+
+ * New upstream release.
+ - Adds Python 3.x support (LP: #687601)
+ * Refresh patches.
+ * Use upstream example images, rather than re-generating. (LP: #686731)
+
+ -- Stefano Rivera <stefano at rivera.za.net> Sat, 18 Dec 2010 16:35:11 +0200
+
+objgraph (1.5.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Refresh patches.
+ * debian/control: Reword description.
+ * Build new Sphinx-based documentation
+
+ -- Stefano Rivera <stefano at rivera.za.net> Wed, 08 Dec 2010 00:13:12 +0200
+
+objgraph (1.4.0-1) experimental; urgency=low
+
+ * New upstream release.
+ - Drop README.Debian: Upstream fixed the issues we were warning about.
+ - Extend copyright years.
+ - Add examples: examples.txt and finalizers.png
+ * Convert from python-support to dh_python2.
+ * Use debhelper's --buildsystem=python_distutils option instead of removing
+ Makefile in clean.
+ * debian/control:
+ - Bump Standards-Version to 3.9.1 (no changes needed).
+ - Suggest: xdot (now packaged)
+ * Patches:
+ - Dropped dont-call-xdot.patch: Now builds and runs with or without an
+ xdot in PATH.
+ - Refreshed Patches.
+
+ -- Stefano Rivera <stefano at rivera.za.net> Mon, 08 Nov 2010 02:22:13 +0200
+
+objgraph (1.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #566798)
+
+ -- Stefano Rivera <stefano at rivera.za.net> Thu, 28 Jan 2010 13:00:22 +0200
Deleted: packages/objgraph/tags/1.7.0-1/debian/patches/quoting-py3k-utf8.patch
===================================================================
--- packages/objgraph/trunk/debian/patches/quoting-py3k-utf8.patch 2011-03-11 21:51:32 UTC (rev 16106)
+++ packages/objgraph/tags/1.7.0-1/debian/patches/quoting-py3k-utf8.patch 2011-03-12 15:31:35 UTC (rev 16109)
@@ -1,39 +0,0 @@
-Description: Fix quoting.txt test for Py3k + non-UTF-8 locales
- File objects are, by default, wrapped with an ASCII codec on Python 3.
- Use UTF-8 explicitly.
-Author: Stefano Rivera <stefanor at debian.org>
-Forwarded: https://code.launchpad.net/~stefanor/objgraph/quoting-py3k-utf8/+merge/53041
-Last-Update: 2011-03-11
-
---- a/objgraph.py
-+++ b/objgraph.py
-@@ -33,6 +33,7 @@
- __date__ = "2011-03-11"
-
-
-+import codecs
- import gc
- import re
- import inspect
-@@ -508,11 +509,20 @@
- if not isinstance(objs, (list, tuple)):
- objs = [objs]
- if filename and filename.endswith('.dot'):
-- f = open(filename, 'w')
-+ try:
-+ f = open(filename, 'w', encoding='UTF-8')
-+ except TypeError:
-+ # Python 2.x compatibility
-+ f = codecs.open(filename, 'w', encoding='UTF-8')
- dot_filename = filename
- else:
- fd, dot_filename = tempfile.mkstemp('.dot', text=True)
- f = os.fdopen(fd, "w")
-+ if f.encoding != None:
-+ # Python 3 will wrap the file in the user's preferred encoding
-+ # Re-wrap it for UTF-8
-+ import io
-+ f = io.TextIOWrapper(f.detach(), 'UTF-8')
- f.write('digraph ObjectGraph {\n'
- ' node[shape=box, style=filled, fillcolor=white];\n')
- queue = []
Copied: packages/objgraph/tags/1.7.0-1/debian/patches/quoting-py3k-utf8.patch (from rev 16107, packages/objgraph/trunk/debian/patches/quoting-py3k-utf8.patch)
===================================================================
--- packages/objgraph/tags/1.7.0-1/debian/patches/quoting-py3k-utf8.patch (rev 0)
+++ packages/objgraph/tags/1.7.0-1/debian/patches/quoting-py3k-utf8.patch 2011-03-12 15:31:35 UTC (rev 16109)
@@ -0,0 +1,35 @@
+Description: Fix quoting.txt test for Py3k + non-UTF-8 locales
+ File objects are, by default, wrapped with an ASCII codec on Python 3.
+ Use UTF-8 explicitly.
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: https://code.launchpad.net/~stefanor/objgraph/quoting-py3k-utf8/+merge/53041
+Last-Update: 2011-03-11
+
+--- a/objgraph.py
++++ b/objgraph.py
+@@ -33,6 +33,7 @@
+ __date__ = "2011-03-11"
+
+
++import codecs
+ import gc
+ import re
+ import inspect
+@@ -508,11 +509,16 @@
+ if not isinstance(objs, (list, tuple)):
+ objs = [objs]
+ if filename and filename.endswith('.dot'):
+- f = open(filename, 'w')
++ f = codecs.open(filename, 'w', encoding='utf-8')
+ dot_filename = filename
+ else:
+ fd, dot_filename = tempfile.mkstemp('.dot', text=True)
+ f = os.fdopen(fd, "w")
++ if f.encoding != None:
++ # Python 3 will wrap the file in the user's preferred encoding
++ # Re-wrap it for utf-8
++ import io
++ f = io.TextIOWrapper(f.detach(), 'utf-8')
+ f.write('digraph ObjectGraph {\n'
+ ' node[shape=box, style=filled, fillcolor=white];\n')
+ queue = []
Deleted: packages/objgraph/tags/1.7.0-1/debian/patches/utf8-changes.patch
===================================================================
--- packages/objgraph/trunk/debian/patches/utf8-changes.patch 2011-03-11 21:51:32 UTC (rev 16106)
+++ packages/objgraph/tags/1.7.0-1/debian/patches/utf8-changes.patch 2011-03-12 15:31:35 UTC (rev 16109)
@@ -1,32 +0,0 @@
-Description: Fix UnicodeDecodeError in non-UTF-8 locales
- CHANGES.txt contains non-ASCII characters.
- Explicitly decode it as UTF-8.
-Author: Stefano Rivera <stefanor at debian.org>
-Forwarded: https://code.launchpad.net/~stefanor/objgraph/utf8-changes/+merge/53031
-Last-Update: 2011-03-11
-
---- a/setup.py
-+++ b/setup.py
-@@ -10,9 +10,9 @@
-
-
- def read(filename):
-- f = open(relative(filename))
-+ f = open(relative(filename), 'rb')
- try:
-- return f.read()
-+ return f.read().decode('utf-8')
- finally:
- f.close()
-
-@@ -34,7 +34,9 @@
- def get_description():
- readme = read('README.txt')
- changelog = read('CHANGES.txt')
-- return unsphinx(readme + '\n\n\n' + changelog)
-+ description = unsphinx(readme + '\n\n\n' + changelog)
-+ description = description.encode('ascii', 'replace').decode('ascii')
-+ return description
-
-
- def build_images(doctests=()):
Copied: packages/objgraph/tags/1.7.0-1/debian/patches/utf8-changes.patch (from rev 16107, packages/objgraph/trunk/debian/patches/utf8-changes.patch)
===================================================================
--- packages/objgraph/tags/1.7.0-1/debian/patches/utf8-changes.patch (rev 0)
+++ packages/objgraph/tags/1.7.0-1/debian/patches/utf8-changes.patch 2011-03-12 15:31:35 UTC (rev 16109)
@@ -0,0 +1,39 @@
+Description: Fix UnicodeDecodeError in non-UTF-8 locales
+ CHANGES.txt contains non-ASCII characters.
+ Explicitly decode it as UTF-8.
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: https://code.launchpad.net/~stefanor/objgraph/utf8-changes/+merge/53031
+Last-Update: 2011-03-11
+
+--- a/setup.py
++++ b/setup.py
+@@ -1,5 +1,5 @@
+ #!/usr/bin/python
+-import os, re, sys, unittest, doctest
++import codecs, os, re, sys, unittest, doctest
+
+ from distutils.core import setup
+
+@@ -10,7 +10,7 @@
+
+
+ def read(filename):
+- f = open(relative(filename))
++ f = codecs.open(relative(filename), 'r', 'utf-8')
+ try:
+ return f.read()
+ finally:
+@@ -34,7 +34,12 @@
+ def get_description():
+ readme = read('README.txt')
+ changelog = read('CHANGES.txt')
+- return unsphinx(readme + '\n\n\n' + changelog)
++ description = unsphinx(readme + '\n\n\n' + changelog)
++ if '--unicode-description' in sys.argv:
++ sys.argv.remove('--unicode-description')
++ else:
++ description = description.encode('ascii', 'replace').decode('ascii')
++ return description
+
+
+ def build_images(doctests=()):
More information about the Python-modules-commits
mailing list