[Python-modules-commits] [utidylib] 10/16: New upstream release.
Michal Cihar
nijel at moszumanska.debian.org
Thu Jul 7 12:53:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
nijel pushed a commit to branch master
in repository utidylib.
commit d2e91a24054f1acbd6b356dd2737c09510009e8b
Author: Michal Čihař <michal at cihar.com>
Date: Thu Jul 7 14:44:07 2016 +0200
New upstream release.
* New upstream release.
- All patches are now upstream.
- Brings support for HTML 5 tidy.
---
debian/changelog | 14 ++---
debian/patches/fix-pointer-size.patch | 103 --------------------------------
debian/patches/fix_libtidy_import.patch | 24 --------
debian/patches/series | 3 -
debian/patches/unicode-strings.patch | 30 ----------
5 files changed, 7 insertions(+), 167 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 013133f..b8dd668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,18 @@
-utidylib (0.2-10) UNRELEASED; urgency=low
+utidylib (0.3-1) UNRELEASED; urgency=low
[ Michal Čihař ]
- * NOT RELEASED YET
+ * Switch to new upstream.
+ * New upstream release.
+ - All patches are now upstream.
+ - Brings support for HTML 5 tidy.
* Bump standards to 3.9.8.
+ * Add dh-python to build depends.
* Adjust Vcs-Svn URL.
[ Ondřej Nový ]
* Fixed VCS URL (https)
- [ Michal Čihař ]
- * Add dh-python to build depends.
- * Switch to new upstream.
-
- -- Michal Čihař <nijel at debian.org> Thu, 31 Oct 2013 10:10:23 +0100
+ -- Michal Čihař <nijel at debian.org> Thu, 07 Jul 2016 14:43:40 +0200
utidylib (0.2-9) unstable; urgency=low
diff --git a/debian/patches/fix-pointer-size.patch b/debian/patches/fix-pointer-size.patch
deleted file mode 100644
index 0d71bc4..0000000
--- a/debian/patches/fix-pointer-size.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 09277ef83447e9d9ec92c3296e28475cc2ed1042 Mon Sep 17 00:00:00 2001
-From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
-Date: Thu, 8 Oct 2015 14:22:14 -0700
-Subject: Fix handling of 64-bit pointer
-
-Origin: http://developer.berlios.de/bugs/?func=detailbug&bug_id=14691&group_id=1810
-Patch-Name: fix-pointer-size.patch
----
- tidy/lib.py | 23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/tidy/lib.py b/tidy/lib.py
-index 67927a2..40f1035 100644
---- a/tidy/lib.py
-+++ b/tidy/lib.py
-@@ -18,7 +18,7 @@ from cStringIO import StringIO
- import weakref
- from tidy.error import *
-
--# search the path for libtidy using the known names; try the package
-+# search the path for libtidy using the known names; try the package
- # directory too
- thelib=None
- os.environ['PATH'] = "%s%s%s" % (packagedir, os.pathsep, os.environ['PATH'])
-@@ -33,7 +33,7 @@ if not thelib:
- raise OSError("Couldn't find libtidy, please make sure it is installed.")
-
- class Loader:
-- """I am a trivial wrapper that eliminates the need for tidy.tidyFoo,
-+ """I am a trivial wrapper that eliminates the need for tidy.tidyFoo,
- so you can just access tidy.Foo
- """
- def __init__(self):
-@@ -46,6 +46,7 @@ class Loader:
- return getattr(self.lib, name)
-
- _tidy=Loader()
-+_tidy.Create.restype = ctypes.POINTER(ctypes.c_void_p)
-
- # define a callback to pass to Tidylib
- def _putByte(handle, c):
-@@ -53,7 +54,7 @@ def _putByte(handle, c):
- sinkfactory[handle].putByte(c)
- return 0
-
--PUTBYTEFUNC=ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_int, ctypes.c_char)
-+PUTBYTEFUNC=ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_int, ctypes.c_char)
- putByte=PUTBYTEFUNC(_putByte)
-
- class _OutputSink(ctypes.Structure):
-@@ -94,7 +95,7 @@ class ReportItem:
- return "line %d col %d - %s: %s" % (self.line, self.col,
- severities[self.severity],
- self.message)
--
-+
- else:
- return "%s: %s" % (severities[self.severity], self.message)
- except KeyError:
-@@ -103,7 +104,7 @@ class ReportItem:
- def __repr__(self):
- return "%s('%s')" % (self.__class__.__name__,
- str(self).replace("'", "\\'"))
--
-+
- class FactoryDict(dict):
- """I am a dict with a create method and no __setitem__. This allows
- me to control my own keys.
-@@ -114,7 +115,7 @@ class FactoryDict(dict):
- dict.__setitem__(self, name, value)
- def __setitem__(self, name, value):
- raise TypeError, "Use create() to get a new object"
--
-+
-
- class SinkFactory(FactoryDict):
- """Mapping for lookup of sinks by handle"""
-@@ -161,12 +162,12 @@ errors = {'missing or malformed argument for option: ': OptionArgError,
- class DocumentFactory(FactoryDict):
- def _setOptions(self, doc, **options):
- for k in options.keys():
--
-+
- # this will flush out most argument type errors...
- if options[k] is None: options[k] = ''
--
-- _tidy.OptParseValue(doc.cdoc,
-- k.replace('_', '-'),
-+
-+ _tidy.OptParseValue(doc.cdoc,
-+ k.replace('_', '-'),
- str(options[k]))
- if doc.errors:
- match=filter(doc.errors[-1].message.startswith, errors.keys())
-@@ -216,7 +217,7 @@ class DocumentFactory(FactoryDict):
- return doc
- def releaseDoc(self, ref):
- _tidy.Release(self[ref])
--
-+
- docfactory = DocumentFactory()
- parse = docfactory.parse
- parseString = docfactory.parseString
diff --git a/debian/patches/fix_libtidy_import.patch b/debian/patches/fix_libtidy_import.patch
deleted file mode 100644
index 42a8b73..0000000
--- a/debian/patches/fix_libtidy_import.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d3797738921bf2754b9ead7ea589add9cc876623 Mon Sep 17 00:00:00 2001
-From: Igor Stroh <jenner at debian.org>
-Date: Thu, 8 Oct 2015 14:22:13 -0700
-Subject: Add 'tidy' to the list of lib names, so it can be imported correctly
- in debian
-
-Patch-Name: fix_libtidy_import.patch
----
- tidy/lib.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tidy/lib.py b/tidy/lib.py
-index be0c11b..67927a2 100644
---- a/tidy/lib.py
-+++ b/tidy/lib.py
-@@ -22,7 +22,7 @@ from tidy.error import *
- # directory too
- thelib=None
- os.environ['PATH'] = "%s%s%s" % (packagedir, os.pathsep, os.environ['PATH'])
--for libname in ('cygtidy-0-99-0', 'libtidy', 'libtidy.so',
-+for libname in ('tidy', 'cygtidy-0-99-0', 'libtidy', 'libtidy.so',
- 'libtidy-0.99.so.0', 'tidylib'):
- try:
- thelib = getattr(ctypes.cdll, libname)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 25b2c7b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-unicode-strings.patch
-fix_libtidy_import.patch
-fix-pointer-size.patch
diff --git a/debian/patches/unicode-strings.patch b/debian/patches/unicode-strings.patch
deleted file mode 100644
index b0f656c..0000000
--- a/debian/patches/unicode-strings.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From bc6e3a16c7e73e304e3071b9680a30da44b26ad2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <nijel at debian.org>
-Date: Thu, 8 Oct 2015 14:22:12 -0700
-Subject: Fix handling of unicode strings
-
-Forwarded: https://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=3011&group_id=1810
-
-Patch-Name: unicode-strings.patch
----
- tidy/lib.py | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/tidy/lib.py b/tidy/lib.py
-index 5f0dbce..be0c11b 100644
---- a/tidy/lib.py
-+++ b/tidy/lib.py
-@@ -204,6 +204,13 @@ class DocumentFactory(FactoryDict):
- @param st: the string to parse
- @return: a document object
- """
-+ if type(st) == unicode:
-+ try:
-+ enc = kwargs['char_encoding']
-+ except KeyError:
-+ enc = 'utf8'
-+ kwargs['char_encoding'] = enc
-+ st = st.encode(enc)
- doc = self._create(**kwargs)
- self.loadString(doc, st)
- return doc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/utidylib.git
More information about the Python-modules-commits
mailing list