From e9e888f16e451740a9187c218cd22ef16d74575f Mon Sep 17 00:00:00 2001 From: Python3pkg Date: Sun, 21 May 2017 13:53:04 -0700 Subject: [PATCH] Convert to Python3 --- execjs/__init__.py | 2 +- execjs/__main__.py | 4 ++-- execjs/_pyv8runtime.py | 2 +- execjs/_runner_sources.py | 2 +- setup.py | 2 +- test_execjs.py | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/execjs/__init__.py b/execjs/__init__.py index 394a357..8116e51 100755 --- a/execjs/__init__.py +++ b/execjs/__init__.py @@ -20,7 +20,7 @@ >>> ctx.call("add", 1, 2) 3 ''' -from __future__ import unicode_literals, division, with_statement + from execjs._exceptions import Error, RuntimeError, ProgramError, RuntimeUnavailableError import execjs._runtimes diff --git a/execjs/__main__.py b/execjs/__main__.py index 28cf92f..db3a51a 100755 --- a/execjs/__main__.py +++ b/execjs/__main__.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: ascii -*- -from __future__ import unicode_literals + import sys import io from argparse import ArgumentParser, Action, SUPPRESS @@ -19,7 +19,7 @@ def __init__(self, option_strings, dest=SUPPRESS, default=SUPPRESS, help=None): ) def __call__(self, parser, namespace, values, option_string=None): - message = "".join(name + "\n" for name, runtime in execjs.runtimes().items() if runtime.is_available()) + message = "".join(name + "\n" for name, runtime in list(execjs.runtimes().items()) if runtime.is_available()) parser.exit(message=message) diff --git a/execjs/_pyv8runtime.py b/execjs/_pyv8runtime.py index c5edcff..47b8f7e 100644 --- a/execjs/_pyv8runtime.py +++ b/execjs/_pyv8runtime.py @@ -78,7 +78,7 @@ def convert(cls, obj): return None elif isinstance(obj, _PyV8.JSObject): ret = {} - for k in obj.keys(): + for k in list(obj.keys()): v = cls.convert(obj[k]) if v is not None: ret[cls.convert(k)] = v diff --git a/execjs/_runner_sources.py b/execjs/_runner_sources.py index a90a745..e232a80 100644 --- a/execjs/_runner_sources.py +++ b/execjs/_runner_sources.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: ascii -*- -from __future__ import unicode_literals, division, with_statement + Node = r"""(function(program, execJS) { execJS(program) })(function() { #{source} diff --git a/setup.py b/setup.py index f09e310..ca361aa 100755 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: ascii -*- -from __future__ import division, with_statement + from setuptools import setup, find_packages import sys import io diff --git a/test_execjs.py b/test_execjs.py index 5e7f815..239d030 100755 --- a/test_execjs.py +++ b/test_execjs.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: ascii -*- -from __future__ import unicode_literals + import sys import os import doctest @@ -92,7 +92,7 @@ def setUp(self): self.runtime = execjs -for name, runtime in execjs.runtimes().items(): +for name, runtime in list(execjs.runtimes().items()): if not runtime.is_available(): continue class_name = name.capitalize() + "RuntimeTest"