Merge 7320c0e into 33c81e1

.gitignore

@@ -42,3 +42,6 @@ htmlcov/
 
 # TextMate
 .tm_properties
+
+# Local env
+.envs

cookiecutter/prompt.py

@@ -23,15 +23,15 @@ def prompt_for_config(context):
     field names and sample values.
     """
     cookiecutter_dict = {}
-    
+
     for key, val in iteritems(context['cookiecutter']):
-        prompt = "{0} (default is \"{1}\")? ".format(key, val)
-        new_val = input(prompt)
+        prompt = u"{0} (default is \"{1}\")? ".format(key, val)
+        new_val = input(prompt.encode('utf-8'))
         new_val = new_val.strip()
 
         if new_val == '':
             new_val = val
-        
+
         if PY3:
             cookiecutter_dict[key] = new_val
         else:

tests/test_examples.py

@@ -15,20 +15,20 @@
 
 PY3 = sys.version > '3'
 if PY3:
+    import subprocess
     from unittest.mock import patch
     input_str = 'builtins.input'
     from io import StringIO
 else:
+    import subprocess32 as subprocess
     import __builtin__
     from mock import patch
     input_str = '__builtin__.raw_input'
     from cStringIO import StringIO
 
-if sys.version_info[:2] < (2, 7):
+if sys.version_info[:3] < (2, 7):
     import unittest2 as unittest
-    import subprocess32 as subprocess
 else:
-    import subprocess
     import unittest
 
 try:

tests/test_prompt.py

@@ -30,7 +30,7 @@
 
 
 class TestPrompt(unittest.TestCase):
-    
+
     @patch(input_str, lambda x: 'Audrey Roy')
     def test_prompt_for_config_simple(self):
         context = {"cookiecutter": {"full_name": "Your Name"}}
@@ -55,6 +55,20 @@ def test_prompt_for_config_unicode(self):
         else:
             self.assertEqual(cookiecutter_dict, {"full_name": u"Pizzä ïs Gööd"})
 
+    @patch(input_str, lambda x: 'Pizzä ïs Gööd')
+    def test_unicode_prompt_for_config_unicode(self):
+        context = {"cookiecutter": {"full_name": u"Řekni či napiš své jméno"}}
+
+        if not PY3:
+            sys.stdin = StringIO("Pizzä ïs Gööd")
+
+        cookiecutter_dict = prompt.prompt_for_config(context)
+
+        if PY3:
+            self.assertEqual(cookiecutter_dict, {"full_name": "Pizzä ïs Gööd"})
+        else:
+            self.assertEqual(cookiecutter_dict, {"full_name": u"Pizzä ïs Gööd"})
+
 
 class TestQueryAnswers(unittest.TestCase):