Merge pull request #41 from eliangcs/issues/39-non-ascii

Fix #39: non-ascii character issue on Python 2

http_prompt/completer.py

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 import re
 import six
 
@@ -41,7 +44,8 @@ def compile_rules(rules):
 def fuzzyfinder(text, collection):
     """https://github.com/amjith/fuzzyfinder"""
     suggestions = []
-    text = str(text) if not isinstance(text, str) else text
+    if not isinstance(text, six.text_type):
+        text = six.u(text, 'utf-8')
     pat = '.*?'.join(map(re.escape, text))
     regex = re.compile(pat, flags=re.IGNORECASE)
     for item in collection:

tests/test_completer.py

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 import six
 import unittest
 
@@ -58,3 +61,11 @@ def test_rm_option(self):
         self.context.options['--form'] = None
         result = self.get_completions('rm -o ')
         self.assertEqual(result[0], '--form')
+
+    def test_querystring_with_chinese(self):
+        result = self.get_completions('name==王')
+        self.assertFalse(result)
+
+    def test_header_with_spanish(self):
+        result = self.get_completions('X-Custom-Header:Jesú')
+        self.assertFalse(result)

tests/test_execution.py

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 import unittest
 
 import pytest
@@ -268,6 +271,12 @@ def test_querystring_with_single_quotes(self):
             'name': 'John Doe'
         })
 
+    def test_querystring_with_chinese(self):
+        execute("name==王小明", self.context)
+        self.assertEqual(self.context.querystring_params, {
+            'name': '王小明'
+        })
+
     def test_simple_body_params(self):
         execute('username=john password=123', self.context)
         self.assertEqual(self.context.body_params, {
@@ -296,6 +305,12 @@ def test_body_param_with_double_quotes(self):
             'password': '123'
         })
 
+    def test_body_param_with_spanish(self):
+        execute('name=Jesús', self.context)
+        self.assertEqual(self.context.body_params, {
+            'name': 'Jesús'
+        })
+
     def test_long_option_names(self):
         execute('--auth user:pass --form', self.context)
         self.assertEqual(self.context.options, {