commit test

thomasballinger · thomasballinger · commit 27c041ffcb21 · 2016-07-28T21:51:44.000-04:00
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -85,7 +85,13 @@ def __init__(self, locals=None, encoding=None):
         necessarily must be with the current factoring) and then an exception
         callback can be added to the Interpreter instance afterwards - more
         specifically, this is so that autoindentation does not occur after a
-        traceback."""
+        traceback.
+
+        encoding is only used in Python 2, where it may be necessary to add an
+        encoding comment to a source bytestring before running it.
+        encoding must be a bytestring in Python 2 because it will be templated
+        into a bytestring source as part of an encoding comment.
+        """
 
         self.encoding = encoding or sys.getdefaultencoding()
         self.syntaxerror_callback = None
diff --git a/bpython/test/test_args.py b/bpython/test/test_args.py
@@ -1,15 +1,12 @@
+# encoding: utf-8
+
 import subprocess
 import sys
 import tempfile
 from textwrap import dedent
 
 from bpython import args
-from bpython.test import FixLanguageTestCase as TestCase
-
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+from bpython.test import (FixLanguageTestCase as TestCase, unittest)
 
 try:
     from nose.plugins.attrib import attr
@@ -40,6 +37,22 @@ def test_exec_dunder_file(self):
             self.assertEquals(stderr.strip(), f.name)
 
 
+    def test_exec_nonascii_file(self):
+        with tempfile.NamedTemporaryFile(mode="w") as f:
+            f.write(dedent('''\
+                #!/usr/bin/env python2
+                # coding: utf-8
+                "你好 # nonascii"
+                '''))
+            f.flush()
+            try:
+                subprocess.check_call([
+                    'python', '-m', 'bpython.curtsies',
+                    f.name])
+            except subprocess.CalledProcessError:
+                self.fail('Error running module with nonascii characters')
+
+
 class TestParse(TestCase):
 
     def test_version(self):
