Convert command-line arguments to Unicode before continuing.

This fixes a problem with current SQLAlchemy, which will warn (or even
throw an exception if configured in strict mode) when you try to access a
Unicode column with a non-Unicode string. Yes, even under PY2.

Author: smurfix

flask_script/__init__.py

@@ -11,6 +11,7 @@
 import argparse
 
 from flask import Flask
+from flask._compat import text_type
 
 from ._compat import iteritems
 from .commands import Group, Option, Command, Server, Shell
@@ -405,11 +406,13 @@ def run(self, commands=None, default_command=None):
         if commands:
             self._commands.update(commands)
 
-        if default_command is not None and len(sys.argv) == 1:
-            sys.argv.append(default_command)
+        # Make sure all of this is Unicode
+        argv = list(text_type(arg) for arg in sys.argv)
+        if default_command is not None and len(argv) == 1:
+            argv.append(default_command)
 
         try:
-            result = self.handle(sys.argv[0], sys.argv[1:])
+            result = self.handle(argv[0], argv[1:])
         except SystemExit as e:
             result = e.code
 

setup.py

@@ -14,6 +14,8 @@
 import sys
 from setuptools import setup
 
+version='2.0.6'
+
 # Hack to prevent stupid TypeError: 'NoneType' object is not callable error on
 # exit of python setup.py test # in multiprocessing/util.py _exit_function when
 # running python setup.py test (see
@@ -27,9 +29,9 @@
 
 setup(
     name='Flask-Script',
-    version='2.0.5',
+    version=version,
     url='http://github.com/smurfix/flask-script',
-	download_url = 'https://github.com/smurfix/flask-script/tarball/v2.0.3',
+	download_url = 'https://github.com/smurfix/flask-script/tarball/v'+version,
     license='BSD',
     author='Dan Jacob',
     author_email='danjac354@gmail.com',

tests.py

@@ -567,7 +567,7 @@ def test_run_catch_all(self, capsys):
         code = run('manage.py catch pos1 --foo pos2 --bar', manager.run)
         out, err = capsys.readouterr()
         assert code == 0
-        assert "['pos1', 'pos2', '--bar']" in out
+        assert "[u'pos1', u'pos2', u'--bar']" in out
 
     def test_run_bad_options(self, capsys):
         manager = Manager(self.app)