[Python-modules-commits] r31530 - in packages/pygments/trunk/debian (4 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Thu Dec 4 20:12:30 UTC 2014
Date: Thursday, December 4, 2014 @ 20:12:28
Author: piotr
Revision: 31530
* New upstream release
- pygmentize no longer fails when writing UTF-8 to output files
(closes: 771724)
* Drop doc/_build from the tarball (mostly due to missing JS sources; these
files are regenerated anyway)
* Remove .pyc files from upstream tarball
* make_utf8_default patch removed, no longer needed
Modified:
packages/pygments/trunk/debian/changelog
packages/pygments/trunk/debian/patches/series
packages/pygments/trunk/debian/rules
Deleted:
packages/pygments/trunk/debian/patches/make_utf8_default.patch
Modified: packages/pygments/trunk/debian/changelog
===================================================================
--- packages/pygments/trunk/debian/changelog 2014-12-04 00:06:26 UTC (rev 31529)
+++ packages/pygments/trunk/debian/changelog 2014-12-04 20:12:28 UTC (rev 31530)
@@ -1,10 +1,20 @@
-pygments (2.0~rc1.a2bc2bd+dfsg-2) UNRELEASED; urgency=medium
+pygments (2.0.1+dfsg-1) unstable; urgency=medium
+ [ Dmitry Shachnev ]
* Drop disable_example_files_test.patch, no longer needed.
* Enable verbose tests output.
- -- Dmitry Shachnev <mitya57 at debian.org> Thu, 06 Nov 2014 14:49:27 +0300
+ [ Piotr Ożarowski ]
+ * New upstream release
+ - pygmentize no longer fails when writing UTF-8 to output files
+ (closes: 771724)
+ * Drop doc/_build from the tarball (mostly due to missing JS sources; these
+ files are regenerated anyway)
+ * Remove .pyc files from upstream tarball
+ * make_utf8_default patch removed, no longer needed
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 09 Nov 2014 23:03:38 +0100
+
pygments (2.0~rc1.a2bc2bd+dfsg-1) unstable; urgency=medium
[ Jakub Wilk ]
Deleted: packages/pygments/trunk/debian/patches/make_utf8_default.patch
===================================================================
--- packages/pygments/trunk/debian/patches/make_utf8_default.patch 2014-12-04 00:06:26 UTC (rev 31529)
+++ packages/pygments/trunk/debian/patches/make_utf8_default.patch 2014-12-04 20:12:28 UTC (rev 31530)
@@ -1,119 +0,0 @@
-use UTF-8 by default
-`echo "Ożarowski" | pygmentize -l diff` works fine now :-)
-
-upstream knows about this patch (will not apply it as not all distributions are
-using UTF-8 by default, like Debian does)
-
-Index: Pygments-2.0rc1/pygments/formatters/latex.py
-===================================================================
---- Pygments-2.0rc1.orig/pygments/formatters/latex.py
-+++ Pygments-2.0rc1/pygments/formatters/latex.py
-@@ -417,7 +417,7 @@ class LatexFormatter(Formatter):
- dict(docclass = self.docclass,
- preamble = self.preamble,
- title = self.title,
-- encoding = self.encoding or 'latin1',
-+ encoding = self.encoding or 'utf-8',
- styledefs = self.get_style_defs(),
- code = outfile.getvalue()))
-
-Index: Pygments-2.0rc1/pygments/lexer.py
-===================================================================
---- Pygments-2.0rc1.orig/pygments/lexer.py
-+++ Pygments-2.0rc1/pygments/lexer.py
-@@ -71,7 +71,7 @@ class Lexer(object):
- ``encoding``
- If given, must be an encoding name. This encoding will be used to
- convert the input string to Unicode, if it is not already a Unicode
-- string (default: ``'latin1'``).
-+ string (default: ``'utf-8'``).
- Can also be ``'guess'`` to use a simple UTF-8 / Locale / Latin1
- detection, or ``'chardet'`` to use the chardet library, if it is
- installed.
-@@ -103,7 +103,7 @@ class Lexer(object):
- self.stripall = get_bool_opt(options, 'stripall', False)
- self.ensurenl = get_bool_opt(options, 'ensurenl', True)
- self.tabsize = get_int_opt(options, 'tabsize', 0)
-- self.encoding = options.get('encoding', 'latin1')
-+ self.encoding = options.get('encoding', 'utf-8')
- self.encoding = options.get('inencoding') or self.encoding
- self.filters = []
- for filter_ in get_list_opt(options, 'filters', ()):
-Index: Pygments-2.0rc1/pygments/lexers/__init__.py
-===================================================================
---- Pygments-2.0rc1.orig/pygments/lexers/__init__.py
-+++ Pygments-2.0rc1/pygments/lexers/__init__.py
-@@ -116,7 +116,7 @@ def find_lexer_class_for_filename(_fn, c
-
- if sys.version_info > (3,) and isinstance(code, bytes):
- # decode it, since all analyse_text functions expect unicode
-- code = code.decode('latin1')
-+ code = code.decode('utf-8')
-
- def get_rating(info):
- cls, filename = info
-Index: Pygments-2.0rc1/pygments/formatters/other.py
-===================================================================
---- Pygments-2.0rc1.orig/pygments/formatters/other.py
-+++ Pygments-2.0rc1/pygments/formatters/other.py
-@@ -64,7 +64,7 @@ class RawTokenFormatter(Formatter):
- Formatter.__init__(self, **options)
- # We ignore self.encoding if it is set, since it gets set for lexer
- # and formatter if given with -Oencoding on the command line.
-- self.encoding = 'ascii' # let pygments.format() do the right thing
-+ self.encoding = 'utf-8' # let pygments.format() do the right thing
- self.compress = get_choice_opt(options, 'compress',
- ['', 'none', 'gz', 'bz2'], '')
- self.error_color = options.get('error_color', None)
-Index: Pygments-2.0rc1/doc/docs/cmdline.rst
-===================================================================
---- Pygments-2.0rc1.orig/doc/docs/cmdline.rst
-+++ Pygments-2.0rc1/doc/docs/cmdline.rst
-@@ -137,7 +137,7 @@ Pygments tries to be smart regarding enc
- as the output encoding.
-
- * If you don't give an encoding and have given an output file, the default
-- encoding for lexer and formatter is ``latin1`` (which will pass through
-+ encoding for lexer and formatter is ``utf-8`` (which will pass through
- all non-ASCII characters).
-
- * If you don't give an encoding and haven't given an output file (that means
-Index: Pygments-2.0rc1/doc/docs/lexers.rst
-===================================================================
---- Pygments-2.0rc1.orig/doc/docs/lexers.rst
-+++ Pygments-2.0rc1/doc/docs/lexers.rst
-@@ -27,7 +27,7 @@ Currently, **all lexers** support these
- `encoding`
- If given, must be an encoding name (such as ``"utf-8"``). This encoding
- will be used to convert the input string to Unicode (if it is not already
-- a Unicode string). The default is ``"latin1"``.
-+ a Unicode string). The default is ``"utf-8"``.
-
- If this option is set to ``"guess"``, a simple UTF-8 vs. Latin-1
- detection is used, if it is set to ``"chardet"``, the
-Index: Pygments-2.0rc1/doc/docs/unicode.rst
-===================================================================
---- Pygments-2.0rc1.orig/doc/docs/unicode.rst
-+++ Pygments-2.0rc1/doc/docs/unicode.rst
-@@ -6,7 +6,7 @@ Since Pygments 0.6, all lexers use unico
- you might encounter the occasional :exc:`UnicodeDecodeError` if you pass strings
- with the wrong encoding.
-
--Per default all lexers have their input encoding set to `latin1`.
-+Per default all lexers have their input encoding set to `utf-8`.
- If you pass a lexer a string object (not unicode), it tries to decode the data
- using this encoding.
- You can override the encoding using the `encoding` lexer option. If you have the
-Index: Pygments-2.0rc1/pygments/formatters/img.py
-===================================================================
---- Pygments-2.0rc1.orig/pygments/formatters/img.py
-+++ Pygments-2.0rc1/pygments/formatters/img.py
-@@ -295,7 +295,7 @@ class ImageFormatter(Formatter):
- raise PilNotAvailable(
- 'Python Imaging Library is required for this formatter')
- Formatter.__init__(self, **options)
-- self.encoding = 'latin1' # let pygments.format() do the right thing
-+ self.encoding = 'utf-8' # let pygments.format() do the right thing
- # Read the style
- self.styles = dict(self.style)
- if self.style.background_color is None:
Modified: packages/pygments/trunk/debian/patches/series
===================================================================
--- packages/pygments/trunk/debian/patches/series 2014-12-04 00:06:26 UTC (rev 31529)
+++ packages/pygments/trunk/debian/patches/series 2014-12-04 20:12:28 UTC (rev 31530)
@@ -1,2 +1 @@
-make_utf8_default.patch
change_docs_theme.patch
Modified: packages/pygments/trunk/debian/rules
===================================================================
--- packages/pygments/trunk/debian/rules 2014-12-04 00:06:26 UTC (rev 31529)
+++ packages/pygments/trunk/debian/rules 2014-12-04 20:12:28 UTC (rev 31530)
@@ -61,8 +61,9 @@
get-orig-source:
VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p');\
uscan --force-download --rename --download-version=$$VER --destdir=.;\
- tar -zx --exclude=tests/examplefiles --exclude=test/test_examplefiles.py -f pygments_$$VER.orig.tar.gz;\
- tar -zcf ./pygments_$$VER+dfsg.orig.tar.gz Pygments-*;\
+ tar -zx --exclude=doc/_build --exclude=tests/examplefiles --exclude=test/test_examplefiles.py -f pygments_$$VER.orig.tar.gz;\
+ find . -name '*.pyc' -delete;\
+ tar -zcf ./pygments_$$VER+dfsg.orig.tar.gz Pygments-*;\
rm -f ./pygments_$$VER.orig.tar.gz;\
rm -rf Pygments-*
More information about the Python-modules-commits
mailing list