incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [02/36] git commit: [#6534] ticket:415 decode wiki page to unicode and fixed kw['tools'] error
Date Fri, 27 Sep 2013 16:43:07 GMT
[#6534]  ticket:415 decode wiki page to unicode and fixed kw['tools'] error


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/5646ef7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/5646ef7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/5646ef7a

Branch: refs/heads/db/6534
Commit: 5646ef7abb011ffdc9cf2a18f2f8eed8437fe675
Parents: 9f08887
Author: Yuriy Arhipov <yuriyarhipovua@yandex.ru>
Authored: Wed Sep 4 12:49:41 2013 +0400
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Sep 27 16:28:56 2013 +0000

----------------------------------------------------------------------
 ForgeImporters/forgeimporters/base.py        | 3 +++
 ForgeImporters/forgeimporters/github/wiki.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5646ef7a/ForgeImporters/forgeimporters/base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index ea01968..8b89219 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -255,6 +255,9 @@ class ProjectImporter(BaseController):
             redirect('.')
 
         self.after_project_create(c.project, **kw)
+        if isinstance(kw['tools'], basestring):
+            kw['tools'] = [kw['tools'], ]
+
         for importer_name in kw['tools']:
             import_tool.post(importer_name, **kw)
         M.AuditLog.log('import project from %s' % self.source)

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5646ef7a/ForgeImporters/forgeimporters/github/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/wiki.py b/ForgeImporters/forgeimporters/github/wiki.py
index 562d6b5..54a9870 100644
--- a/ForgeImporters/forgeimporters/github/wiki.py
+++ b/ForgeImporters/forgeimporters/github/wiki.py
@@ -73,7 +73,7 @@ class GitHubWikiImporter(ToolImporter):
         result = dict()
         wiki_pages = self.get_wiki_pages_form_git(wiki_url)
         for page_name, page_text in wiki_pages.iteritems():
-            page_text = h.render_any_markup(page_name, page_text)
+            page_text = h.render_any_markup(page_name, h.really_unicode(page_text))
             result[page_name.split('.')[0]] = page_text
         return result
 


Mime
View raw message