Commit a044a609 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
Browse files

Distutils version of Python3 completed - achievement unlocked (mypy,pylint,flake8)

parent 41b91434
......@@ -4,6 +4,4 @@
"""
asn2dataModel converts ASN.1 modules to a variety of target languages
"""
from . import msgPrinter
from . import msgPrinterASN1
__version__ = 1.0
......@@ -116,7 +116,7 @@ of each SUBPROGRAM param.'''
f.close()
os.unlink(astFile)
parserUtility = os.path.join(os.path.abspath(os.path.dirname(__file__)), "parse_aadl.py")
cmd = parserUtility + " -o " + astFile + ' ' + ' '.join(sys.argv[1:])
cmd = "python2 " + parserUtility + " -o " + astFile + ' ' + ' '.join(sys.argv[1:])
if os.system(cmd) != 0:
if os.path.exists(astFile):
os.unlink(astFile)
......
......@@ -14,4 +14,4 @@ from . import verify
from . import recursiveMapper
from . import cleanupNodes
__version__ = "1.2.5"
__version__ = "1.3"
......@@ -35,17 +35,17 @@ import copy
from typing import Tuple, List
from ..commonPy import configMT
from ..commonPy.asnAST import sourceSequenceLimit, AsnNode # NOQA pylint: disable=unused-import
from ..commonPy import asnParser
from ..commonPy.asnParser import ( # NOQA pylint: disable=unused-import
from .commonPy import configMT
from .commonPy.asnAST import sourceSequenceLimit, AsnNode # NOQA pylint: disable=unused-import
from .commonPy import asnParser
from .commonPy.asnParser import ( # NOQA pylint: disable=unused-import
AST_Lookup, AST_Leaftypes,
Typename, Filename, ParseAsnFileList)
from ..commonPy.utility import inform, panic
from ..commonPy import cleanupNodes
from ..commonPy.recursiveMapper import RecursiveMapper
from .commonPy.utility import inform, panic
from .commonPy import cleanupNodes
from .commonPy.recursiveMapper import RecursiveMapper
from ..commonPy import verify
from .commonPy import verify
def usage():
......
......@@ -33,17 +33,17 @@ import copy
from typing import Tuple, List
from ..commonPy import configMT
from ..commonPy.asnAST import sourceSequenceLimit, AsnNode # NOQA pylint: disable=unused-import
from ..commonPy import asnParser
from ..commonPy.asnParser import ( # NOQA pylint: disable=unused-import
from .commonPy import configMT
from .commonPy.asnAST import sourceSequenceLimit, AsnNode # NOQA pylint: disable=unused-import
from .commonPy import asnParser
from .commonPy.asnParser import ( # NOQA pylint: disable=unused-import
AST_Lookup, AST_Leaftypes,
Typename, Filename, ParseAsnFileList)
from ..commonPy.utility import inform, panic
from ..commonPy import cleanupNodes
from ..commonPy.recursiveMapper import RecursiveMapper
from .commonPy.utility import inform, panic
from .commonPy import cleanupNodes
from .commonPy.recursiveMapper import RecursiveMapper
from ..commonPy import verify
from .commonPy import verify
def usage():
......@@ -169,9 +169,6 @@ class Printer(RecursiveMapper):
def main():
sys.path.append(os.path.abspath(os.path.dirname(sys.argv[0])))
sys.path.append('commonPy')
if sys.argv.count("-o") != 0:
idx = sys.argv.index("-o")
try:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment