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 B770510234 for ; Fri, 4 Oct 2013 14:43:04 +0000 (UTC) Received: (qmail 44833 invoked by uid 500); 4 Oct 2013 14:42:56 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 44569 invoked by uid 500); 4 Oct 2013 14:42:53 -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 44202 invoked by uid 99); 4 Oct 2013 14:42:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Oct 2013 14:42:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3D86190F9A4; Fri, 4 Oct 2013 14:42:51 +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 Date: Fri, 04 Oct 2013 14:43:18 -0000 Message-Id: In-Reply-To: <4e630057a87148c2948bce4ae81d81e3@git.apache.org> References: <4e630057a87148c2948bce4ae81d81e3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/44] git commit: [#6534] ticket:442 Return unicode string from rewrite_links [#6534] ticket:442 Return unicode string from rewrite_links Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3c9c7dbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3c9c7dbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3c9c7dbe Branch: refs/heads/master Commit: 3c9c7dbec903e239601e394306f0e750a34c7aa6 Parents: 0d66ce8 Author: Igor Bondarenko Authored: Thu Sep 26 16:58:53 2013 +0300 Committer: Dave Brondsema Committed: Fri Oct 4 14:21:23 2013 +0000 ---------------------------------------------------------------------- ForgeImporters/forgeimporters/github/tests/test_wiki.py | 4 ++-- ForgeImporters/forgeimporters/github/wiki.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3c9c7dbe/ForgeImporters/forgeimporters/github/tests/test_wiki.py ---------------------------------------------------------------------- diff --git a/ForgeImporters/forgeimporters/github/tests/test_wiki.py b/ForgeImporters/forgeimporters/github/tests/test_wiki.py index 46e58e4..b53dab5 100644 --- a/ForgeImporters/forgeimporters/github/tests/test_wiki.py +++ b/ForgeImporters/forgeimporters/github/tests/test_wiki.py @@ -309,14 +309,14 @@ Our website is [[http://sf.net]]. importer.app.url = '/p/test/wiki/' f = importer.convert_markup source = u''' -''-- Al'fredas 235 BC'' +''Al'fredas 235 BC'' == See also == * [https://github/a/b/wiki/AgentSpring-running-instructions-for-d13n-model Test1] * [https://github/a/b/wiki/AgentSpring-conventions Test2] * [https://github/a/b/wiki/AgentSpring-Q&A Test3] * [https://github/a/b/wiki/Extensions Test4]''' - result = u'''_-- Al'fredas 235 BC_ + result = u'''_Al'fredas 235 BC_ ## See also http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3c9c7dbe/ForgeImporters/forgeimporters/github/wiki.py ---------------------------------------------------------------------- diff --git a/ForgeImporters/forgeimporters/github/wiki.py b/ForgeImporters/forgeimporters/github/wiki.py index fa08d0c..0a4b2ee 100644 --- a/ForgeImporters/forgeimporters/github/wiki.py +++ b/ForgeImporters/forgeimporters/github/wiki.py @@ -333,4 +333,4 @@ class GitHubWikiImporter(ToolImporter): a.setString(new_page) elif a.text == prefix + page: a.setString(new_prefix + new_page) - return str(soup) + return unicode(soup)