Slight reorganizing of Python tree

python/python/opm/io/__init__.py

@@ -1,3 +1 @@
-from opm._common import action
-
-from .parser import parse, load_deck, load_deck_string, parse_string
+from .parser import *

python/python/opm/io/config/__init__.py

@@ -0,0 +1 @@
+from .config import *

python/python/opm/io/config/config.py

@@ -1,13 +1,15 @@
 from __future__ import absolute_import
 
 from opm import libopmcommon_python as lib
-from .sunbeam import delegate
+from ..parser.sunbeam import delegate
+
 
 @delegate(lib.SummaryConfig)
 class SummaryConfig(object):
     def __repr__(self):
         return 'SummaryConfig()'
 
+
 @delegate(lib.EclipseConfig)
 class EclipseConfig(object):
     def __repr__(self):

python/python/opm/io/parser/__init__.py

@@ -0,0 +1,4 @@
+from opm._common import action
+
+from .parser import parse, load_deck, load_deck_string, parse_string
+

python/python/opm/io/parser/properties.py

@@ -3,8 +3,8 @@ from os.path import isfile
 
 from opm import libopmcommon_python as lib
 from .sunbeam import delegate
-from .schedule import Schedule
-from .config import EclipseConfig
+from ..schedule import Schedule
+from ..config import EclipseConfig
 
 @delegate(lib.EclipseState)
 class EclipseState(object):

python/python/opm/io/schedule/__init__.py

@@ -0,0 +1 @@
+from .schedule import *

python/python/opm/io/schedule/schedule.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from opm import libopmcommon_python as lib
-from .sunbeam import delegate
+from ..parser.sunbeam import delegate
 
 @delegate(lib.Schedule)
 class Schedule(object):

python/python/opm/tools/time_vector.py

@@ -6,7 +6,7 @@ except ImportError:
     from io import StringIO
 
 
-from opm.parser import load_deck, load_deck_string
+from opm.io.parser import load_deck, load_deck_string
 
 # This is from the TimeMap.cpp implementation in opm
 ecl_month = {"JAN" : 1,

python/setup.py

@@ -76,6 +76,9 @@ setup(
     packages=[
                 'opm',
                 'opm.io',
+                'opm.io.parser',
+                'opm.io.schedule',
+                'opm.io.config',
                 'opm.tools'
             ],
     ext_modules=ext_modules,