From f9651c3957f5f35e189a3c44c6d27833d55411c9 Mon Sep 17 00:00:00 2001 From: Neil Schemenauer Date: Thu, 26 May 2016 18:04:27 +0000 Subject: [PATCH] Remove erroneous 'self' parameter for source_to_code() PTLFileLoader.source_to_code() is a static method and should not have a 'self' parameter. Use absolute imports in ptl_compile.py so it can be run as a script. --- quixote/ptl/ptl_compile.py | 6 +++--- quixote/ptl/ptl_import.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/quixote/ptl/ptl_compile.py b/quixote/ptl/ptl_compile.py index 8afcada..47778f9 100644 --- a/quixote/ptl/ptl_compile.py +++ b/quixote/ptl/ptl_compile.py @@ -9,8 +9,8 @@ import imp import struct import importlib.util import py_compile -from .ptl_import import PTL_EXT, PTLFileLoader -from .ptl_parse import parse +from quixote.ptl.ptl_import import PTL_EXT, PTLFileLoader +from quixote.ptl.ptl_parse import parse def ptl_compile(file, cfile, dfile=None, doraise=False, optimize=-1): @@ -49,7 +49,7 @@ def ptl_compile(file, cfile, dfile=None, doraise=False, optimize=-1): loader = PTLFileLoader('', file) source_bytes = loader.get_data(file) try: - code = loader.source_to_code(None, source_bytes, dfile or file, + code = loader.source_to_code(source_bytes, dfile or file, _optimize=optimize) except Exception as err: py_exc = py_compile.PyCompileError(err.__class__, err, dfile or file) diff --git a/quixote/ptl/ptl_import.py b/quixote/ptl/ptl_import.py index f17782d..0c9e4df 100644 --- a/quixote/ptl/ptl_import.py +++ b/quixote/ptl/ptl_import.py @@ -10,7 +10,7 @@ PTL_EXT = ".ptl" class PTLFileLoader(SourceFileLoader): @staticmethod - def source_to_code(self, data, path, *, _optimize=-1): + def source_to_code(data, path, *, _optimize=-1): node = parse(data, path) return compile(node, path, 'exec', dont_inherit=True, optimize=_optimize)