fix test for python3

wtforms · Aug 8, 2013 · a60a010 · a60a010
1 parent c156e26
commit a60a010
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,14 +7,6 @@ python:
     - "3.3"
 
 install:
-    # TODO: remove babel when it is released
-    - pip install pytz
-    - git clone https://github.com/mitsuhiko/babel.git
-    - cd babel
-    - python setup.py import_cldr install
-    - cd ..
-    - rm -fr babel
-    # Normal installation
     - pip install -r requirements.txt
 
 script:

diff --git a/requirements.txt b/requirements.txt
@@ -4,4 +4,3 @@ WTForms>=1.0.4
 # for testing
 nose
 Flask-Babel
-# -e git://github.com/mitsuhiko/babel.git#egg=Babel
diff --git a/tests/base.py b/tests/base.py
@@ -6,10 +6,13 @@
 from flask.ext.wtf import Form
 from wtforms import TextField, HiddenField, SubmitField
 from wtforms.validators import DataRequired
+from flask.ext.wtf._compat import text_type
 
 
 def to_unicode(text):
-    return text.decode('utf-8')
+    if not isinstance(text, text_type):
+        return text.decode('utf-8')
+    return text
 
 
 class _JSONEncoder(JSONEncoder):