Fix Python 2.6 support, update requirements.

playpauseandstop · playpauseandstop · commit e8e7e89c8edd · 2012-10-29T12:55:30.000+02:00
diff --git a/learnpython/tests/common.py b/learnpython/tests/common.py
@@ -1,14 +1,20 @@
 from flask import url_for
-from flask.ext.testing import JsonResponseMixin, TestCase as BaseTestCase, \
+from flask.ext.testing import JsonResponseMixin, TestCase as FlaskTestCase, \
     Twill as BaseTwill
 from twill import commands
 from webtest import TestApp
 
 from learnpython.app import app, mail
 
+if not hasattr(FlaskTestCase, 'assertIn'):
+    from unittest2 import TestCase
+    BaseTestCase = type('BaseTestCase', (FlaskTestCase, TestCase), {})
+else:
+    BaseTestCase = FlaskTestCase
+
 
 __all__ = ('TEST_COMMENTS', 'TEST_EMAIL', 'TEST_MESSAGE', 'TEST_NAME',
-           'TEST_PHONE', 'TEST_SUBJECT', 'Mechanize', 'TestCase', 'Twill')
+           'TEST_PHONE', 'TEST_SUBJECT', 'TestCase', 'Twill')
 
 
 TEST_COMMENTS = 'Test additional comments.'
diff --git a/requirements.txt b/requirements.txt
@@ -1,23 +1,23 @@
 Babel==0.9.6
-blinker==1.2
-docutils==0.9.1
 Flask==0.9
 Flask-Babel==0.8
 Flask-FlatPages==0.3
 Flask-LazyViews==0.3
 Flask-Mail==0.7.2
+Flask-Script==0.5.1
 Flask-Testing==0.4
 Flask-WTF==0.8
-gunicorn==0.14.6
+WTForms==1.0.2
+WebTest==1.4.0
+blinker==1.2
+docutils==0.9.1
+gunicorn==0.15.0
 lxml==2.3.5
 nose==1.2.1
 ordereddict==1.1
 pyquery==1.2.1
 selenium==2.25.0
 splinter==0.4.8
 twill==0.9
-WebTest==1.4.0
+unittest2==0.5.1
 windmill==1.6
-WTForms==1.0.2
-
-https://github.com/techniq/flask-script/tarball/master#egg=Flask-Script
