[WAYANG-#8] Change in names for readibility
Signed-off-by: bertty <bertty@apache.org>
diff --git a/python/src/pywy/core/plan.py b/python/src/pywy/core/plan.py
index 53d06fb..69be628 100644
--- a/python/src/pywy/core/plan.py
+++ b/python/src/pywy/core/plan.py
@@ -1,7 +1,7 @@
from typing import ( Iterable, Set )
from pywy.graph.graph import WayangGraph
-from pywy.graph.graphtypes import ( NodeOperator, WGraphOfVec, NodeVec )
+from pywy.graph.types import ( NodeOperator, WGraphOfVec, NodeVec )
from pywy.operators.sink import SinkOperator
from pywy.core.plugin import Plugin
diff --git a/python/src/pywy/core/translator.py b/python/src/pywy/core/translator.py
index 2719f42..f70b2cd 100644
--- a/python/src/pywy/core/translator.py
+++ b/python/src/pywy/core/translator.py
@@ -1,4 +1,4 @@
-from pywy.graph.graphtypes import ( WGraphOfVec, NodeVec )
+from pywy.graph.types import ( WGraphOfVec, NodeVec )
from pywy.core.plugin import Plugin
from pywy.core.plan import PywyPlan
from pywy.core.mapping import Mapping
diff --git a/python/src/pywy/graph/graphtypes.py b/python/src/pywy/graph/types.py
similarity index 100%
rename from python/src/pywy/graph/graphtypes.py
rename to python/src/pywy/graph/types.py
diff --git a/python/src/pywy/platforms/python/execution/executor.py b/python/src/pywy/platforms/python/execution.py
similarity index 92%
rename from python/src/pywy/platforms/python/execution/executor.py
rename to python/src/pywy/platforms/python/execution.py
index 93bba46..398ef89 100644
--- a/python/src/pywy/platforms/python/execution/executor.py
+++ b/python/src/pywy/platforms/python/execution.py
@@ -1,10 +1,10 @@
from typing import List
-from pywy.graph.graphtypes import WGraphOfOperator, NodeOperator
+from pywy.graph.types import WGraphOfOperator, NodeOperator
from pywy.core import Channel
from pywy.core import Executor
from pywy.core import PywyPlan
-from pywy.platforms.python.operators.PyExecutionOperator import PyExecutionOperator
+from pywy.platforms.python.operator.py_execution_operator import PyExecutionOperator
class PyExecutor(Executor):
diff --git a/python/src/pywy/platforms/python/mappings.py b/python/src/pywy/platforms/python/mappings.py
index e0411be..d949c18 100644
--- a/python/src/pywy/platforms/python/mappings.py
+++ b/python/src/pywy/platforms/python/mappings.py
@@ -1,5 +1,5 @@
from pywy.core import Mapping
-from pywy.platforms.python.operators import *
+from pywy.platforms.python.operator import *
PywyOperatorMappings = Mapping()
diff --git a/python/src/pywy/platforms/python/operator/__init__.py b/python/src/pywy/platforms/python/operator/__init__.py
new file mode 100644
index 0000000..ec6db06
--- /dev/null
+++ b/python/src/pywy/platforms/python/operator/__init__.py
@@ -0,0 +1,11 @@
+from pywy.platforms.python.operator.py_execution_operator import PyExecutionOperator
+from pywy.platforms.python.operator.py_unary_filter import PyFilterOperator
+from pywy.platforms.python.operator.py_source_textfile import PyTextFileSourceOperator
+from pywy.platforms.python.operator.py_sink_textfile import PyTextFileSinkOperator
+
+__ALL__ = [
+ PyExecutionOperator,
+ PyFilterOperator,
+ PyTextFileSourceOperator,
+ PyTextFileSinkOperator
+]
\ No newline at end of file
diff --git a/python/src/pywy/platforms/python/operators/PyExecutionOperator.py b/python/src/pywy/platforms/python/operator/py_execution_operator.py
similarity index 100%
rename from python/src/pywy/platforms/python/operators/PyExecutionOperator.py
rename to python/src/pywy/platforms/python/operator/py_execution_operator.py
diff --git a/python/src/pywy/platforms/python/operators/PyTextFileSinkOperator.py b/python/src/pywy/platforms/python/operator/py_sink_textfile.py
similarity index 93%
rename from python/src/pywy/platforms/python/operators/PyTextFileSinkOperator.py
rename to python/src/pywy/platforms/python/operator/py_sink_textfile.py
index 20a23f7..9fe9fc0 100644
--- a/python/src/pywy/platforms/python/operators/PyTextFileSinkOperator.py
+++ b/python/src/pywy/platforms/python/operator/py_sink_textfile.py
@@ -1,6 +1,6 @@
from typing import Set
from pywy.operators.sink import TextFileSink
-from pywy.platforms.python.operators.PyExecutionOperator import PyExecutionOperator
+from pywy.platforms.python.operator.py_execution_operator import PyExecutionOperator
from pywy.platforms.python.channels import (
Channel,
ChannelDescriptor,
diff --git a/python/src/pywy/platforms/python/operators/PyTextFileSourceOperator.py b/python/src/pywy/platforms/python/operator/py_source_textfile.py
similarity index 93%
rename from python/src/pywy/platforms/python/operators/PyTextFileSourceOperator.py
rename to python/src/pywy/platforms/python/operator/py_source_textfile.py
index 4ca43d7..7bdf7f2 100644
--- a/python/src/pywy/platforms/python/operators/PyTextFileSourceOperator.py
+++ b/python/src/pywy/platforms/python/operator/py_source_textfile.py
@@ -1,6 +1,6 @@
from typing import Set
from pywy.operators.source import TextFileSource
-from pywy.platforms.python.operators.PyExecutionOperator import PyExecutionOperator
+from pywy.platforms.python.operator.py_execution_operator import PyExecutionOperator
from pywy.platforms.python.channels import (
Channel,
ChannelDescriptor,
diff --git a/python/src/pywy/platforms/python/operators/PyFilterOperator.py b/python/src/pywy/platforms/python/operator/py_unary_filter.py
similarity index 95%
rename from python/src/pywy/platforms/python/operators/PyFilterOperator.py
rename to python/src/pywy/platforms/python/operator/py_unary_filter.py
index e9e4e38..ae02784 100644
--- a/python/src/pywy/platforms/python/operators/PyFilterOperator.py
+++ b/python/src/pywy/platforms/python/operator/py_unary_filter.py
@@ -1,6 +1,6 @@
from typing import Set
from pywy.operators.unary import FilterOperator
-from pywy.platforms.python.operators.PyExecutionOperator import PyExecutionOperator
+from pywy.platforms.python.operator.py_execution_operator import PyExecutionOperator
from pywy.platforms.python.channels import (
Channel,
ChannelDescriptor,
diff --git a/python/src/pywy/platforms/python/operators/__init__.py b/python/src/pywy/platforms/python/operators/__init__.py
deleted file mode 100644
index 2f7f3ca..0000000
--- a/python/src/pywy/platforms/python/operators/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from pywy.platforms.python.operators.PyExecutionOperator import PyExecutionOperator
-from pywy.platforms.python.operators.PyFilterOperator import PyFilterOperator
-from pywy.platforms.python.operators.PyTextFileSourceOperator import PyTextFileSourceOperator
-from pywy.platforms.python.operators.PyTextFileSinkOperator import PyTextFileSinkOperator
-
-__ALL__ = [
- PyExecutionOperator,
- PyFilterOperator,
- PyTextFileSourceOperator,
- PyTextFileSinkOperator
-]
\ No newline at end of file
diff --git a/python/src/pywy/platforms/python/platform/platform.py b/python/src/pywy/platforms/python/platform.py
similarity index 100%
rename from python/src/pywy/platforms/python/platform/platform.py
rename to python/src/pywy/platforms/python/platform.py
diff --git a/python/src/pywy/platforms/python/platform/__init__.py b/python/src/pywy/platforms/python/platform/__init__.py
deleted file mode 100644
index f7ba351..0000000
--- a/python/src/pywy/platforms/python/platform/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from pywy.platforms.python.platform.platform import PythonPlatform
\ No newline at end of file
diff --git a/python/src/pywy/platforms/python/plugin/plugin.py b/python/src/pywy/platforms/python/plugin.py
similarity index 85%
rename from python/src/pywy/platforms/python/plugin/plugin.py
rename to python/src/pywy/platforms/python/plugin.py
index ead1a85..4f41470 100644
--- a/python/src/pywy/platforms/python/plugin/plugin.py
+++ b/python/src/pywy/platforms/python/plugin.py
@@ -1,5 +1,5 @@
from pywy.core import Executor
-from pywy.platforms.python.execution.executor import PyExecutor
+from pywy.platforms.python.execution import PyExecutor
from pywy.platforms.python.platform import PythonPlatform
from pywy.core import Plugin
from pywy.platforms.python.mappings import PywyOperatorMappings
diff --git a/python/src/pywy/platforms/python/plugin/__init__.py b/python/src/pywy/platforms/python/plugin/__init__.py
deleted file mode 100644
index 8c6b17e..0000000
--- a/python/src/pywy/platforms/python/plugin/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from pywy.platforms.python.plugin.plugin import PythonPlugin
\ No newline at end of file
