[Python-modules-commits] r9015 - in packages/pygments/trunk/debian (6 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Thu Jul 9 21:22:09 UTC 2009
Date: Thursday, July 9, 2009 @ 21:22:07
Author: piotr
Revision: 9015
* Add use_jinja2_to_generate_docs patch and replace python-jinja with
python-jinja2 build dependency
* Standards-Version bumped to 3.8.2 (no changes needed)
Added:
packages/pygments/trunk/debian/patches/use_jinja2_to_generate_docs.patch
Modified:
packages/pygments/trunk/debian/changelog
packages/pygments/trunk/debian/control
packages/pygments/trunk/debian/patches/disable_ez_setup.patch
packages/pygments/trunk/debian/patches/make_utf8_default.patch
packages/pygments/trunk/debian/patches/series
Modified: packages/pygments/trunk/debian/changelog
===================================================================
--- packages/pygments/trunk/debian/changelog 2009-07-09 19:51:17 UTC (rev 9014)
+++ packages/pygments/trunk/debian/changelog 2009-07-09 21:22:07 UTC (rev 9015)
@@ -1,3 +1,11 @@
+pygments (1.0-3) unstable; urgency=low
+
+ * Add use_jinja2_to_generate_docs patch and replace python-jinja with
+ python-jinja2 build dependency
+ * Standards-Version bumped to 3.8.2 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org> Thu, 09 Jul 2009 22:30:15 +0200
+
pygments (1.0-2) unstable; urgency=low
* Add description to the patches
Modified: packages/pygments/trunk/debian/control
===================================================================
--- packages/pygments/trunk/debian/control 2009-07-09 19:51:17 UTC (rev 9014)
+++ packages/pygments/trunk/debian/control 2009-07-09 21:22:07 UTC (rev 9015)
@@ -5,8 +5,8 @@
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5), quilt (>=0.40)
Build-Depends-Indep: python (>= 2.3.5-11), python-all-dev, python-support (>= 0.6.4),
- python-setuptools (>= 0.6b3), python-docutils, python-jinja (>= 1.0)
-Standards-Version: 3.8.0
+ python-setuptools (>= 0.6b3), python-docutils, python-jinja2
+Standards-Version: 3.8.2
Homepage: http://pygments.pocoo.org/
XS-Python-Version: >= 2.3
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pygments/trunk/
Modified: packages/pygments/trunk/debian/patches/disable_ez_setup.patch
===================================================================
--- packages/pygments/trunk/debian/patches/disable_ez_setup.patch 2009-07-09 19:51:17 UTC (rev 9014)
+++ packages/pygments/trunk/debian/patches/disable_ez_setup.patch 2009-07-09 21:22:07 UTC (rev 9015)
@@ -1,9 +1,9 @@
python-setuptools is in Build-Depends-Indep, no need to download it at build time
-Index: pygments-0.9/setup.py
+Index: pygments-1.0/setup.py
===================================================================
---- pygments-0.9.orig/setup.py
-+++ pygments-0.9/setup.py
+--- pygments-1.0.orig/setup.py
++++ pygments-1.0/setup.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
Modified: packages/pygments/trunk/debian/patches/make_utf8_default.patch
===================================================================
--- packages/pygments/trunk/debian/patches/make_utf8_default.patch 2009-07-09 19:51:17 UTC (rev 9014)
+++ packages/pygments/trunk/debian/patches/make_utf8_default.patch 2009-07-09 21:22:07 UTC (rev 9015)
@@ -4,13 +4,13 @@
upstream knows about this patch (will not apply it as not all distributions are
using UTF-8 by defauly, like Debian does)
-Index: pygments-0.10/pygments/cmdline.py
+Index: pygments-1.0/pygments/cmdline.py
===================================================================
---- pygments-0.10.orig/pygments/cmdline.py
-+++ pygments-0.10/pygments/cmdline.py
-@@ -351,17 +351,17 @@ def main(args=sys.argv):
- return 2
- code = sys.stdin.read()
+--- pygments-1.0.orig/pygments/cmdline.py
++++ pygments-1.0/pygments/cmdline.py
+@@ -394,17 +394,17 @@ def main(args=sys.argv):
+ else:
+ code = sys.stdin.read()
- # No encoding given? Use latin1 if output file given,
+ # No encoding given? Use utf-8 if output file given,
@@ -30,11 +30,11 @@
# ... and do it!
try:
-Index: pygments-0.10/pygments/formatters/latex.py
+Index: pygments-1.0/pygments/formatters/latex.py
===================================================================
---- pygments-0.10.orig/pygments/formatters/latex.py
-+++ pygments-0.10/pygments/formatters/latex.py
-@@ -236,6 +236,6 @@ class LatexFormatter(Formatter):
+--- pygments-1.0.orig/pygments/formatters/latex.py
++++ pygments-1.0/pygments/formatters/latex.py
+@@ -245,6 +245,6 @@ class LatexFormatter(Formatter):
dict(docclass = self.docclass,
preamble = self.preamble,
title = self.title,
@@ -42,10 +42,10 @@
+ encoding = self.encoding or 'utf-8',
styledefs = self.get_style_defs(),
code = outfile.getvalue()))
-Index: pygments-0.10/pygments/lexer.py
+Index: pygments-1.0/pygments/lexer.py
===================================================================
---- pygments-0.10.orig/pygments/lexer.py
-+++ pygments-0.10/pygments/lexer.py
+--- pygments-1.0.orig/pygments/lexer.py
++++ pygments-1.0/pygments/lexer.py
@@ -56,7 +56,7 @@ class Lexer(object):
``encoding``
If given, must be an encoding name. This encoding will be used to
Modified: packages/pygments/trunk/debian/patches/series
===================================================================
--- packages/pygments/trunk/debian/patches/series 2009-07-09 19:51:17 UTC (rev 9014)
+++ packages/pygments/trunk/debian/patches/series 2009-07-09 21:22:07 UTC (rev 9015)
@@ -1,2 +1,3 @@
make_utf8_default.patch
disable_ez_setup.patch
+use_jinja2_to_generate_docs.patch
Added: packages/pygments/trunk/debian/patches/use_jinja2_to_generate_docs.patch
===================================================================
--- packages/pygments/trunk/debian/patches/use_jinja2_to_generate_docs.patch (rev 0)
+++ packages/pygments/trunk/debian/patches/use_jinja2_to_generate_docs.patch 2009-07-09 21:22:07 UTC (rev 9015)
@@ -0,0 +1,86 @@
+# Use Jinja2 instead of Jinja to generate docs
+Index: pygments-1.0/docs/generate.py
+===================================================================
+--- pygments-1.0.orig/docs/generate.py
++++ pygments-1.0/docs/generate.py
+@@ -20,7 +20,7 @@ from docutils.parsers.rst import directi
+ from docutils.core import publish_parts
+ from docutils.writers import html4css1
+
+-from jinja import from_string
++from jinja2 import Template
+
+ from pygments import highlight
+ from pygments.lexers import get_lexer_by_name
+@@ -63,7 +63,7 @@ def generate_lexer_docs():
+ out.append('\n' + heading + '\n' + '-'*len(heading) + '\n')
+ for data in lexers:
+ out.append(LEXERDOC % data)
+- return ''.join(out)
++ return ''.join(out).decode('utf-8')
+
+ def generate_formatter_docs():
+ from pygments.formatters import FORMATTERS
+@@ -80,7 +80,7 @@ def generate_formatter_docs():
+
+
+ ''' % (', '.join(data[1]) or 'None', ', '.join(data[2]).replace('*', '\\*') or 'None'))
+- return ''.join(out)
++ return ''.join(out).decode('utf-8')
+
+ def generate_filter_docs():
+ from pygments.filters import FILTERS
+@@ -92,7 +92,7 @@ def generate_filter_docs():
+ %s
+ :Name: %s
+ ''' % (cls.__name__, cls.__doc__, name))
+- return ''.join(out)
++ return ''.join(out).decode('utf-8')
+
+ def generate_changelog():
+ fn = os.path.abspath(os.path.join(os.path.dirname(__file__), '..',
+@@ -110,7 +110,7 @@ def generate_changelog():
+ else:
+ result.append(line.rstrip())
+ f.close()
+- return '\n'.join(result)
++ return '\n'.join(result).decode('utf-8')
+
+ def generate_authors():
+ fn = os.path.abspath(os.path.join(os.path.dirname(__file__), '..',
+@@ -364,7 +364,7 @@ class DocumentationWriter(html4css1.Writ
+ except IndexError:
+ continue
+ ref_id = reference['refid']
+- text = escape(reference.astext().encode('utf-8'))
++ text = escape(reference.astext())
+ toc.append((ref_id, text))
+
+ self._generated_toc = [('#%s' % href, caption) for href, caption in toc]
+@@ -388,8 +388,8 @@ def generate_documentation(data, link_st
+ }
+ )
+ return {
+- 'title': parts['title'].encode('utf-8'),
+- 'body': parts['body'].encode('utf-8'),
++ 'title': parts['title'],
++ 'body': parts['body'],
+ 'toc': parts['toc']
+ }
+
+@@ -421,13 +421,13 @@ def handle_python(filename, fp, dst):
+ def handle_html(filename, fp, dst):
+ now = datetime.now()
+ title = os.path.basename(filename)[:-4]
+- content = fp.read()
++ content = fp.read().decode('utf-8')
+ c = generate_documentation(content, (lambda x: './%s.html' % x))
+ result = file(os.path.join(dst, title + '.html'), 'w')
+ c['style'] = STYLESHEET + PYGMENTS_FORMATTER.get_style_defs('.syntax')
+ c['generation_date'] = now
+ c['file_id'] = title
+- t = from_string(TEMPLATE)
++ t = Template(TEMPLATE)
+ result.write(t.render(c).encode('utf-8'))
+ result.close()
+
More information about the Python-modules-commits
mailing list