Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C695DD3FB for ; Wed, 7 Nov 2012 21:00:48 +0000 (UTC) Received: (qmail 56512 invoked by uid 500); 7 Nov 2012 21:00:48 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 56485 invoked by uid 500); 7 Nov 2012 21:00:48 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 56460 invoked by uid 99); 7 Nov 2012 21:00:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Nov 2012 21:00:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4B96C4544E; Wed, 7 Nov 2012 21:00:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brondsem@apache.org To: allura-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [7/8] git commit: [#4667] upgrade Markdown to 2.2.0 Message-Id: <20121107210048.4B96C4544E@tyr.zones.apache.org> Date: Wed, 7 Nov 2012 21:00:48 +0000 (UTC) [#4667] upgrade Markdown to 2.2.0 Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/16a641fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/16a641fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/16a641fc Branch: refs/heads/master Commit: 16a641fcc8786bba79bbebf6edb5274bc51840c5 Parents: ad2d707 Author: Dave Brondsema Authored: Thu Sep 20 22:36:59 2012 +0000 Committer: Dave Brondsema Committed: Wed Nov 7 20:30:55 2012 +0000 ---------------------------------------------------------------------- Allura/allura/lib/markdown_extensions.py | 6 +++--- requirements-common.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/16a641fc/Allura/allura/lib/markdown_extensions.py ---------------------------------------------------------------------- diff --git a/Allura/allura/lib/markdown_extensions.py b/Allura/allura/lib/markdown_extensions.py index 44197c3..2f7b2f3 100644 --- a/Allura/allura/lib/markdown_extensions.py +++ b/Allura/allura/lib/markdown_extensions.py @@ -308,10 +308,10 @@ class LineOrientedTreeProcessor(markdown.treeprocessors.Treeprocessor): .replace('\n', '
')) new_node = None try: - new_node = markdown.etree.fromstring(new_text) + new_node = markdown.util.etree.fromstring(new_text) except SyntaxError: try: - new_node = markdown.etree.fromstring(unicode(BeautifulSoup(new_text))) + new_node = markdown.util.etree.fromstring(unicode(BeautifulSoup(new_text))) except: log.exception('Error adding
tags: new text is %s', new_text) pass @@ -325,7 +325,7 @@ class AutolinkPattern(markdown.inlinepatterns.LinkPattern): def handleMatch(self, mo): old_link = mo.group(2) - result = markdown.etree.Element('a') + result = markdown.util.etree.Element('a') result.text = old_link result.set('href', old_link) return result http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/16a641fc/requirements-common.txt ---------------------------------------------------------------------- diff --git a/requirements-common.txt b/requirements-common.txt index 83becac..1de1c26 100644 --- a/requirements-common.txt +++ b/requirements-common.txt @@ -19,7 +19,7 @@ Genshi==0.6 httplib2==0.7.4 iso8601==0.1.4 Jinja2==2.6 -Markdown==2.0.3 +Markdown==2.2.0 mercurial==1.4.3 Ming==0.3.2dev-20121101 oauth2==1.5.170