[Python-modules-commits] r23000 - in packages/python-markdown/trunk/debian (4 files)
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Wed Nov 14 05:03:33 UTC 2012
Date: Wednesday, November 14, 2012 @ 05:03:30
Author: mitya57-guest
Revision: 23000
Update to 2012-11-09 from upstream git
Added:
packages/python-markdown/trunk/debian/patches/
packages/python-markdown/trunk/debian/patches/series
packages/python-markdown/trunk/debian/patches/update_to_latest_git.patch
Modified:
packages/python-markdown/trunk/debian/changelog
Modified: packages/python-markdown/trunk/debian/changelog
===================================================================
--- packages/python-markdown/trunk/debian/changelog 2012-11-13 23:24:01 UTC (rev 22999)
+++ packages/python-markdown/trunk/debian/changelog 2012-11-14 05:03:30 UTC (rev 23000)
@@ -1,6 +1,7 @@
python-markdown (2.2.1-3) UNRELEASED; urgency=low
* Redirect tests stderr to stdout (closes: #692813)
+ * Update to 2012-11-09 from upstream git
-- Dmitry Shachnev <mitya57 at gmail.com> Fri, 09 Nov 2012 17:34:03 +0400
Added: packages/python-markdown/trunk/debian/patches/series
===================================================================
--- packages/python-markdown/trunk/debian/patches/series (rev 0)
+++ packages/python-markdown/trunk/debian/patches/series 2012-11-14 05:03:30 UTC (rev 23000)
@@ -0,0 +1,2 @@
+series
+update_to_latest_git.patch
Added: packages/python-markdown/trunk/debian/patches/update_to_latest_git.patch
===================================================================
--- packages/python-markdown/trunk/debian/patches/update_to_latest_git.patch (rev 0)
+++ packages/python-markdown/trunk/debian/patches/update_to_latest_git.patch 2012-11-14 05:03:30 UTC (rev 23000)
@@ -0,0 +1,146 @@
+diff --git a/docs/change_log.txt b/docs/change_log.txt
+index 30cb771..1a078bf 100644
+--- a/docs/change_log.txt
++++ b/docs/change_log.txt
+@@ -9,7 +9,7 @@ Python-Markdown Changelog
+
+ Nov 4, 2012: Released version 2.2.1 ([Notes](release-2.2.1.html)).
+
+-Jul 5, 2012: Released version 2.2.0 (Notes](release-2.2.0.html)).
++Jul 5, 2012: Released version 2.2.0 ([Notes](release-2.2.0.html)).
+
+ Jan 22, 2012: Released version 2.1.1 ([Notes](release-2.1.1.html)).
+
+diff --git a/markdown/__init__.py b/markdown/__init__.py
+index cda6b76..361aca2 100644
+--- a/markdown/__init__.py
++++ b/markdown/__init__.py
+@@ -37,7 +37,6 @@ import re
+ import codecs
+ import sys
+ import logging
+-import warnings
+ import util
+ from preprocessors import build_preprocessors
+ from blockprocessors import build_block_parser
+@@ -379,15 +378,14 @@ class Markdown:
+ output_file.write(html)
+ # Don't close here. User may want to write more.
+ else:
+- if sys.stdout.encoding:
+- # If we are in Python 3 or if we are not piping output:
++ # Encode manually and write bytes to stdout.
++ html = html.encode(encoding, "xmlcharrefreplace")
++ try:
++ # Write bytes directly to buffer (Python 3).
++ sys.stdout.buffer.write(html)
++ except AttributeError:
++ # Probably Python 2, which works with bytes by default.
+ sys.stdout.write(html)
+- else:
+- # In python 2.x if you pipe output on command line,
+- # sys.stdout.encoding is None. So lets set it:
+- writer = codecs.getwriter(encoding)
+- stdout = writer(sys.stdout, errors="xmlcharrefreplace")
+- stdout.write(html)
+
+ return self
+
+diff --git a/markdown/blockprocessors.py b/markdown/blockprocessors.py
+index 7b14a85..1e6160f 100644
+--- a/markdown/blockprocessors.py
++++ b/markdown/blockprocessors.py
+@@ -485,7 +485,7 @@ class HRProcessor(BlockProcessor):
+ # Recursively parse lines before hr so they get parsed first.
+ self.parser.parseBlocks(parent, [prelines])
+ # create hr
+- hr = util.etree.SubElement(parent, 'hr')
++ util.etree.SubElement(parent, 'hr')
+ # check for lines in block after hr.
+ postlines = block[self.match.end():].lstrip('\n')
+ if postlines:
+diff --git a/markdown/extensions/footnotes.py b/markdown/extensions/footnotes.py
+index cfe41ed..064679b 100644
+--- a/markdown/extensions/footnotes.py
++++ b/markdown/extensions/footnotes.py
+@@ -125,7 +125,7 @@ class FootnoteExtension(markdown.Extension):
+
+ div = etree.Element("div")
+ div.set('class', 'footnote')
+- hr = etree.SubElement(div, "hr")
++ etree.SubElement(div, "hr")
+ ol = etree.SubElement(div, "ol")
+
+ for id in self.footnotes.keys():
+diff --git a/markdown/extensions/headerid.py b/markdown/extensions/headerid.py
+index e86ab15..2d18c15 100644
+--- a/markdown/extensions/headerid.py
++++ b/markdown/extensions/headerid.py
+@@ -77,9 +77,7 @@ Dependencies:
+ """
+
+ import markdown
+-from markdown.util import etree
+ import re
+-from string import ascii_lowercase, digits, punctuation
+ import logging
+ import unicodedata
+
+diff --git a/markdown/extensions/smart_strong.py b/markdown/extensions/smart_strong.py
+index 3ed3560..7166989 100644
+--- a/markdown/extensions/smart_strong.py
++++ b/markdown/extensions/smart_strong.py
+@@ -22,7 +22,6 @@ Copyright 2011
+
+ '''
+
+-import re
+ import markdown
+ from markdown.inlinepatterns import SimpleTagPattern
+
+diff --git a/markdown/inlinepatterns.py b/markdown/inlinepatterns.py
+index ab7b4c6..d0f4490 100644
+--- a/markdown/inlinepatterns.py
++++ b/markdown/inlinepatterns.py
+@@ -45,7 +45,6 @@ import util
+ import odict
+ import re
+ from urlparse import urlparse, urlunparse
+-import sys
+ # If you see an ImportError for htmlentitydefs after using 2to3 to convert for
+ # use by Python3, then you are probably using the buggy version from Python 3.0.
+ # We recomend using the tool from Python 3.1 even if you will be running the
+diff --git a/markdown/odict.py b/markdown/odict.py
+index d77d701..02864bf 100644
+--- a/markdown/odict.py
++++ b/markdown/odict.py
+@@ -119,7 +119,7 @@ class OrderedDict(dict):
+ """ Return the index of a given key. """
+ try:
+ return self.keyOrder.index(key)
+- except ValueError, e:
++ except ValueError:
+ raise ValueError("Element '%s' was not found in OrderedDict" % key)
+
+ def index_for_location(self, location):
+diff --git a/markdown/treeprocessors.py b/markdown/treeprocessors.py
+index 841fe0a..fb107d2 100644
+--- a/markdown/treeprocessors.py
++++ b/markdown/treeprocessors.py
+@@ -1,4 +1,3 @@
+-import re
+ import inlinepatterns
+ import util
+ import odict
+diff --git a/markdown/util.py b/markdown/util.py
+index db45a5e..12dcbd5 100644
+--- a/markdown/util.py
++++ b/markdown/util.py
+@@ -1,7 +1,5 @@
+ # -*- coding: utf-8 -*-
+ import re
+-from logging import CRITICAL
+-
+ import etree_loader
+
+
More information about the Python-modules-commits
mailing list