You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2017/09/06 16:49:26 UTC

allura git commit: Optional support for much faster cchardet, used in really_unicode()

Repository: allura
Updated Branches:
  refs/heads/db/cchardet [created] c22d78963


Optional support for much faster cchardet, used in really_unicode()


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

Branch: refs/heads/db/cchardet
Commit: c22d78963429230fb2036b104b53c99ad9de36c5
Parents: db49224
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Sep 6 12:49:21 2017 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Sep 6 12:49:21 2017 -0400

----------------------------------------------------------------------
 Allura/allura/lib/helpers.py | 5 ++++-
 requirements-optional.txt    | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/c22d7896/Allura/allura/lib/helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index f1289e1..c4116da 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -39,7 +39,10 @@ from cStringIO import StringIO
 
 import tg
 import genshi.template
-import chardet
+try:
+    import cchardet as chardet
+except ImportError:
+    import chardet
 import pkg_resources
 from formencode.validators import FancyValidator
 from dateutil.parser import parse

http://git-wip-us.apache.org/repos/asf/allura/blob/c22d7896/requirements-optional.txt
----------------------------------------------------------------------
diff --git a/requirements-optional.txt b/requirements-optional.txt
index accdc43..a94210b 100644
--- a/requirements-optional.txt
+++ b/requirements-optional.txt
@@ -15,3 +15,6 @@ MySQL-python  # GPL
 # One or the other is required to enable spam checking
 akismet==0.2.0
 PyMollom==0.1  # GPL
+
+# faster charset detection
+cchardet==2.1.1  # GPL
\ No newline at end of file