インポート修正

pinfort · Dec 18, 2018 · 21fff61 · 21fff61
1 parent f2773b7
commit 21fff61
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 53 deletions.
diff --git a/segments/APP.py b/segments/APP.py
@@ -1,11 +1,8 @@
-import sys
-import os
 import warnings
-sys.path.append(os.pardir)
 
-from segmentsCommon import SegmentsCommon
+from segments.segmentsCommon import SegmentsCommon
 from markers import Markers
-from APPs.APP0 import APP0
+from segments.APPs.APP0 import APP0
 
 class APP(SegmentsCommon):
     def __init__(self):

diff --git a/segments/APPs/APP0.py b/segments/APPs/APP0.py
@@ -1,9 +1,4 @@
-import sys
-import os
-sys.path.append(os.pardir)
-sys.path.append("../..")
-
-from segmentsCommon import SegmentsCommon
+from segments.segmentsCommon import SegmentsCommon
 from markers import Markers
 
 class APP0(SegmentsCommon):

diff --git a/segments/COM.py b/segments/COM.py
@@ -1,8 +1,4 @@
-import sys
-import os
-sys.path.append(os.pardir)
-
-from segmentsCommon import SegmentsCommon
+from segments.segmentsCommon import SegmentsCommon
 from markers import Markers
 
 class COM(SegmentsCommon):

diff --git a/segments/DHT.py b/segments/DHT.py
@@ -1,8 +1,4 @@
-import sys
-import os
-sys.path.append(os.pardir)
-
-from segmentsCommon import SegmentsCommon
+from segments.segmentsCommon import SegmentsCommon
 from markers import Markers
 
 # Define huffman table

diff --git a/segments/DQT.py b/segments/DQT.py
@@ -1,8 +1,4 @@
-import sys
-import os
-sys.path.append(os.pardir)
-
-from segmentsCommon import SegmentsCommon
+from segments.segmentsCommon import SegmentsCommon
 from markers import Markers
 
 class DQT(SegmentsCommon):

diff --git a/segments/EOI.py b/segments/EOI.py
@@ -1,8 +1,4 @@
-import sys
-import os
-sys.path.append(os.pardir)
-
-from segmentsCommon import SegmentsCommon
+from segments.segmentsCommon import SegmentsCommon
 from markers import Markers
 
 class EOI(SegmentsCommon):

diff --git a/segments/SOF.py b/segments/SOF.py
@@ -1,11 +1,7 @@
-import sys
-import os
-sys.path.append(os.pardir)
-
-from segmentsCommon import SegmentsCommon
+from segments.segmentsCommon import SegmentsCommon
 from markers import Markers
 
-from SOFs.SOF2 import SOF2
+from segments.SOFs.SOF2 import SOF2
 
 class SOF(SegmentsCommon):
     def __init__(self):

diff --git a/segments/SOFs/SOF2.py b/segments/SOFs/SOF2.py
@@ -1,9 +1,4 @@
-import sys
-import os
-sys.path.append(os.pardir)
-sys.path.append("../..")
-
-from segmentsCommon import SegmentsCommon
+from segments.segmentsCommon import SegmentsCommon
 from markers import Markers
 
 class SOF2(SegmentsCommon):

diff --git a/segments/SOI.py b/segments/SOI.py
@@ -1,8 +1,4 @@
-import sys
-import os
-sys.path.append(os.pardir)
-
-from segmentsCommon import SegmentsCommon
+from segments.segmentsCommon import SegmentsCommon
 from markers import Markers
 
 class SOI(SegmentsCommon):

diff --git a/segments/SOS.py b/segments/SOS.py
@@ -1,8 +1,4 @@
-import sys
-import os
-sys.path.append(os.pardir)
-
-from segmentsCommon import SegmentsCommon
+from segments.segmentsCommon import SegmentsCommon
 from markers import Markers
 
 # Start of scan