[fixes #7] Optionally set unicode literals (#8)

Author: Ryan Munro

.travis.yml

@@ -28,6 +28,7 @@ env:
     # - NODE_VERSION="4.0"
 python:
     - "nightly"
+    - "3.6"
     - "3.5"
     - "3.4"
     - "3.3"

appveyor.yml

@@ -8,6 +8,8 @@ environment:
     - PYTHON: "C:\\Python34-x64"
     - PYTHON: "C:\\Python35"
     - PYTHON: "C:\\Python35-x64"
+    - PYTHON: "C:\\Python36"
+    - PYTHON: "C:\\Python36-x64"
 
     - nodejs_version: "7"
     - nodejs_version: "6"

node_python_bridge.py

@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+from codeop import Compile
 import os
 import sys
 import json
@@ -10,6 +11,16 @@
 NODE_CHANNEL_FD = int(os.environ['NODE_CHANNEL_FD'])
 UNICODE_TYPE = unicode if sys.version_info[0] == 2 else str
 
+if sys.version_info[0] <= 2:
+    # print('PY2')
+    def _exec(_code_, _globs_):
+        exec('exec _code_ in _globs_')
+else:
+    _exec = getattr(__builtins__, 'exec')
+
+_locals = {'__name__': '__console__', '__doc__': None}
+_compile = Compile()
+
 
 if platform.system() == 'Windows':
     # hacky reimplementation of https://github.com/nodejs/node/blob/master/deps/uv/src/win/pipe.c
@@ -77,10 +88,11 @@ def format_exception(t=None, e=None, tb=None):
 
             # Run Python code
             if data['type'] == 'execute':
-                exec(data['code'])
+                _exec(_compile(data['code'], '<input>', 'exec'), _locals)
                 response = dict(type='success')
             else:
-                response = dict(type='success', value=eval(data['code']))
+                value = eval(_compile(data['code'], '<input>', 'eval'), _locals)
+                response = dict(type='success', value=value)
         except:
             t, e, tb = sys.exc_info()
             response = dict(type='exception', value=format_exception(t, e, tb))

test.js

@@ -8,6 +8,24 @@ let Promise = require('bluebird');
 let mkdirTemp = Promise.promisify(require('temp').mkdir);
 let path = require('path');
 
+test('leave __future__ alone!', t => {
+    t.plan(2);
+
+    let python = pythonBridge();
+    python.ex`import sys`;
+    python`sys.version_info[0] > 2`.then(py3 => {
+        python`type('').__name__`.then(x => t.equal(x, 'str'));
+        python.ex`from __future__ import unicode_literals`;
+        if (py3) {
+            python`type('').__name__`.then(x => t.equal(x, 'str'));
+        } else {
+            python`type('').__name__`.then(x => t.equal(x, 'unicode'));
+        }
+    }).finally(() => {
+        python.end();
+    });
+});
+
 test('readme', t => {
     t.test('example', t => {
         t.plan(2);