Optionally import cchardet if present

jcea · Jun 22, 2015 · 666e87e · 666e87e
1 parent afed165
commit 666e87e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/aiohttp/client_reqrep.py b/aiohttp/client_reqrep.py
@@ -9,7 +9,10 @@
 import urllib.parse
 import warnings
 
-import chardet
+try:
+    import cchardet as chardet
+except ImportError:
+    import chardet
 
 import aiohttp
 from . import hdrs, helpers, streams

diff --git a/tox.ini b/tox.ini
@@ -1,14 +1,15 @@
 [tox]
 
-envlist = check, {old_asyncio,py33,py34}-{debug,release}-{cython,pure}, reportcov
+envlist = check, {old_asyncio,py33,py34}-{debug,release}-{cchardet,cython,pure}, reportcov
 
 [testenv]
 
 deps =
     nose
     coverage
     gunicorn
-    chardet
+    cchardet: cython
+    cchardet: cchardet
     cython: cython
     old_asyncio: asyncio==3.4.1