Unnecessary sys.path.insert is removed.

shtaxxx · shtaxxx · commit 16c8fe48294b · 2015-11-01T00:01:51.000+09:00
diff --git a/pyverilog/ast_code_generator/codegen.py b/pyverilog/ast_code_generator/codegen.py
@@ -15,7 +15,8 @@
 import functools
 from jinja2 import Environment, FileSystemLoader
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
+if __name__ == '__main__':
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import pyverilog.utils.version
 from pyverilog.vparser.parser import VerilogCodeParser
diff --git a/pyverilog/controlflow/active_analyzer.py b/pyverilog/controlflow/active_analyzer.py
@@ -6,13 +6,13 @@
 # Copyright (C) 2013, Shinya Takamaeda-Yamazaki
 # License: Apache 2.0
 #-------------------------------------------------------------------------------
-
 from __future__ import absolute_import
 from __future__ import print_function
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
+if __name__ == '__main__':
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import pyverilog.utils.version
 import pyverilog.utils.util as util
diff --git a/pyverilog/controlflow/active_range.py b/pyverilog/controlflow/active_range.py
@@ -6,13 +6,13 @@
 # Copyright (C) 2013, Shinya Takamaeda-Yamazaki
 # License: Apache 2.0
 #-------------------------------------------------------------------------------
-
 from __future__ import absolute_import
 from __future__ import print_function
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
+if __name__ == '__main__':
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import pyverilog.utils.version
 import pyverilog.utils.util as util
diff --git a/pyverilog/controlflow/controlflow_analyzer.py b/pyverilog/controlflow/controlflow_analyzer.py
@@ -8,13 +8,13 @@
 # Copyright (C) 2013, Shinya Takamaeda-Yamazaki
 # License: Apache 2.0
 #-------------------------------------------------------------------------------
-
 from __future__ import absolute_import
 from __future__ import print_function
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
+if __name__ == '__main__':
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import pyverilog.utils.version
 import pyverilog.utils.util as util
diff --git a/pyverilog/controlflow/splitter.py b/pyverilog/controlflow/splitter.py
@@ -6,14 +6,11 @@
 # Copyright (C) 2013, Shinya Takamaeda-Yamazaki
 # License: Apache 2.0
 #-------------------------------------------------------------------------------
-
 from __future__ import absolute_import
 from __future__ import print_function
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 import pyverilog.utils.signaltype as signaltype
 from pyverilog.dataflow.dataflow import *
 
diff --git a/pyverilog/controlflow/transition.py b/pyverilog/controlflow/transition.py
@@ -6,14 +6,11 @@
 # Copyright (C) 2013, Shinya Takamaeda-Yamazaki
 # License: Apache 2.0
 #-------------------------------------------------------------------------------
-
 from __future__ import absolute_import
 from __future__ import print_function
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 from pyverilog.dataflow.dataflow import *
 import pyverilog.utils.util as util
 import pyverilog.utils.signaltype as signaltype
diff --git a/pyverilog/dataflow/bindvisitor.py b/pyverilog/dataflow/bindvisitor.py
@@ -13,8 +13,6 @@
 import os
 import re
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 from pyverilog.vparser.ast import *
 import pyverilog.utils.util as util
 import pyverilog.utils.verror as verror
diff --git a/pyverilog/dataflow/codegen.py b/pyverilog/dataflow/codegen.py
@@ -12,7 +12,8 @@
 import os
 import re
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
+if __name__ == '__main__':
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import pyverilog.utils.version
 import pyverilog.utils.util as util
diff --git a/pyverilog/dataflow/dataflow.py b/pyverilog/dataflow/dataflow.py
@@ -14,8 +14,6 @@
 import re
 import copy
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 import pyverilog.utils.verror as verror
 import pyverilog.utils.util as util
 import pyverilog.utils.signaltype as signaltype
diff --git a/pyverilog/dataflow/dataflow_analyzer.py b/pyverilog/dataflow/dataflow_analyzer.py
@@ -12,11 +12,11 @@
 import os
 import subprocess
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
+if __name__ == '__main__':
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+    
 sys.setrecursionlimit(16 * 1024)
 
-import pyverilog
-import pyverilog.utils
 import pyverilog.utils.version
 from pyverilog.vparser.parser import VerilogCodeParser
 from pyverilog.dataflow.modulevisitor import ModuleVisitor
diff --git a/pyverilog/dataflow/graphgen.py b/pyverilog/dataflow/graphgen.py
@@ -14,7 +14,8 @@
 import os
 import pygraphviz as pgv
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
+if __name__ == '__main__':
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import pyverilog.utils.version
 import pyverilog.utils.util as util
diff --git a/pyverilog/dataflow/identifierreplace.py b/pyverilog/dataflow/identifierreplace.py
@@ -11,8 +11,6 @@
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 import pyverilog.vparser.ast as vast
 from pyverilog.vparser.ast import Node
 
diff --git a/pyverilog/dataflow/identifiervisitor.py b/pyverilog/dataflow/identifiervisitor.py
@@ -11,8 +11,6 @@
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 from pyverilog.dataflow.visit import NodeVisitor
 
 def getIdentifiers(node):
diff --git a/pyverilog/dataflow/merge.py b/pyverilog/dataflow/merge.py
@@ -11,7 +11,8 @@
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
+if __name__ == '__main__':
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import pyverilog.utils.version
 import pyverilog.utils.verror as verror
diff --git a/pyverilog/dataflow/modulevisitor.py b/pyverilog/dataflow/modulevisitor.py
@@ -11,8 +11,6 @@
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 import pyverilog.vparser.parser
 from pyverilog.vparser.ast import *
 from pyverilog.dataflow.visit import *
diff --git a/pyverilog/dataflow/optimizer.py b/pyverilog/dataflow/optimizer.py
@@ -10,11 +10,8 @@
 from __future__ import print_function
 import sys
 import os
-
 import math
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 import pyverilog.utils.util as util
 import pyverilog.utils.verror as verror
 import pyverilog.utils.signaltype as signaltype
diff --git a/pyverilog/dataflow/reorder.py b/pyverilog/dataflow/reorder.py
@@ -12,8 +12,6 @@
 import os
 import copy
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 from pyverilog.dataflow.dataflow import *
 
 def reorder(tree):
diff --git a/pyverilog/dataflow/replace.py b/pyverilog/dataflow/replace.py
@@ -11,8 +11,6 @@
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 from pyverilog.dataflow.dataflow import *
 
 def replaceUndefined(tree, termname):
diff --git a/pyverilog/dataflow/signalvisitor.py b/pyverilog/dataflow/signalvisitor.py
@@ -11,8 +11,6 @@
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 from pyverilog.vparser.ast import *
 import pyverilog.utils.util as util
 import pyverilog.utils.verror as verror
diff --git a/pyverilog/dataflow/subset.py b/pyverilog/dataflow/subset.py
@@ -12,7 +12,8 @@
 import os
 import collections
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
+if __name__ == '__main__':
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import pyverilog.utils.version
 import pyverilog.utils.util as util
diff --git a/pyverilog/dataflow/visit.py b/pyverilog/dataflow/visit.py
@@ -14,8 +14,6 @@
 import copy
 import collections
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 import pyverilog
 import pyverilog.utils.util as util
 import pyverilog.utils.verror as verror
diff --git a/pyverilog/dataflow/walker.py b/pyverilog/dataflow/walker.py
@@ -11,7 +11,8 @@
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
+if __name__ == '__main__':
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import pyverilog.utils.version
 import pyverilog.utils.util as util
diff --git a/pyverilog/vparser/lexer.py b/pyverilog/vparser/lexer.py
@@ -13,8 +13,6 @@
 import os
 import re
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 from pyverilog.vparser import ply
 from pyverilog.vparser.ply.lex import *
 
diff --git a/pyverilog/vparser/parser.py b/pyverilog/vparser/parser.py
@@ -12,11 +12,8 @@
 import sys
 import os
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 import pyverilog.utils.version
-from pyverilog.vparser import ply
-from pyverilog.vparser.ply import yacc
+from pyverilog.vparser.ply.yacc import yacc
 from pyverilog.vparser.plyparser import PLYParser, Coord, ParseError
 from pyverilog.vparser.preprocessor import VerilogPreprocessor
 from pyverilog.vparser.lexer import VerilogLexer
@@ -49,9 +46,9 @@ def __init__(self):
         self.lexer.build()
 
         self.tokens = self.lexer.tokens
-        #self.parser = ply.yacc.yacc(module=self)
+        #self.parser = yacc(module=self)
         ## Use this if you want to build the parser using LALR(1) instead of SLR
-        self.parser = ply.yacc.yacc(module=self, method="LALR")
+        self.parser = yacc(module=self, method="LALR")
 
     def _lexer_error_func(self, msg, line, column):
         self._parse_error(msg, self._coord(line, column))
diff --git a/pyverilog/vparser/preprocessor.py b/pyverilog/vparser/preprocessor.py
@@ -16,8 +16,6 @@
 import subprocess
 import re
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
-
 class VerilogPreprocessor(object):
     def __init__(self, filelist, outputfile='pp.out', include=None, define=None):
         self.filelist = filelist
