Cyber: Reorg python wrappers.

cyber/python/examples/client_py3.py → cyber/python/cyber_py3/examples/client_py3.py

@@ -21,7 +21,7 @@
 import os
 import time
 
-from cyber_py import cyber_py3 as cyber
+from cyber_py3 import cyber
 from cyber.proto.unit_test_pb2 import ChatterBenchmark
 
 

cyber/python/examples/listener_py3.py → cyber/python/cyber_py3/examples/listener_py3.py

@@ -21,7 +21,7 @@
 import sys
 
 sys.path.append("../")
-from cyber_py import cyber_py3 as cyber
+from cyber_py3 import cyber
 from cyber.proto.unit_test_pb2 import ChatterBenchmark
 
 

cyber/python/examples/parameter_py3.py → cyber/python/cyber_py3/examples/parameter_py3.py

@@ -20,8 +20,8 @@
 
 import sys
 
-from cyber_py import cyber_py3 as cyber
-from cyber_py import parameter_py3 as parameter
+from cyber_py3 import cyber
+from cyber_py3 import parameter
 
 PARAM_SERVICE_NAME = "global_parameter_service"
 

cyber/python/examples/record_channel_info_py3.py → cyber/python/cyber_py3/examples/record_channel_info_py3.py

@@ -20,8 +20,8 @@
 
 import sys
 
-from cyber_py import cyber_py3 as cyber
-from cyber_py import record_py3 as record
+from cyber_py3 import cyber
+from cyber_py3 import record
 from cyber.proto import record_pb2
 
 

cyber/python/examples/record_py3.py → cyber/python/cyber_py3/examples/record_py3.py

@@ -23,7 +23,7 @@ import sys
 
 sys.path.append("../")
 from cyber.proto.unit_test_pb2 import Chatter
-from cyber_py import record_py3 as record
+from cyber_py3 import record
 from google.protobuf.descriptor_pb2 import FileDescriptorProto
 from modules.common.util.testdata.simple_pb2 import SimpleMessage
 

cyber/python/examples/record_trans_py3.py → cyber/python/cyber_py3/examples/record_trans_py3.py

@@ -21,8 +21,8 @@
 import sys
 
 sys.path.append("../")
-from cyber_py import cyber_py3 as cyber
-from cyber_py import record_py3 as record
+from cyber_py3 import cyber
+from cyber_py3 import record
 
 TEST_RECORD_FILE = "trans_ret.record"
 

cyber/python/examples/service_py3.py → cyber/python/cyber_py3/examples/service_py3.py

@@ -21,7 +21,7 @@
 import sys
 import time
 
-from cyber_py import cyber_py3 as cyber
+from cyber_py3 import cyber
 from cyber.proto.unit_test_pb2 import ChatterBenchmark
 
 

cyber/python/examples/talker_py3.py → cyber/python/cyber_py3/examples/talker_py3.py

@@ -16,7 +16,7 @@
 # limitations under the License.
 # ****************************************************************************
 # -*- coding: utf-8 -*-
-from cyber_py import cyber_py3 as cyber
+from cyber_py3 import cyber
 from cyber.proto.unit_test_pb2 import ChatterBenchmark
 """Module for example of talker."""
 

cyber/python/examples/time_py3.py → cyber/python/cyber_py3/examples/time_py3.py

@@ -21,7 +21,7 @@ import os
 import sys
 import time
 
-from cyber_py import cyber_time_py3 as cyber_time
+from cyber_py3 import cyber_time
 
 
 def test_time():

cyber/python/examples/timer_py3.py → cyber/python/cyber_py3/examples/timer_py3.py

@@ -20,8 +20,8 @@
 
 import time
 
-from cyber_py import cyber_py3 as cyber
-from cyber_py import cyber_timer_py3 as cyber_timer
+from cyber_py3 import cyber
+from cyber_py3 import cyber_timer
 
 
 count = 0

cyber/python/test/test_cyber_py3.py → cyber/python/cyber_py3/test/test_cyber_py3.py

@@ -23,7 +23,7 @@ import time
 import unittest
 
 sys.path.append("../")
-from cyber_py import cyber_py3 as cyber
+from cyber_py3 import cyber
 from modules.common.util.testdata.simple_pb2 import SimpleMessage
 
 

cyber/python/test/test_cyber_time_py3.py → cyber/python/cyber_py3/test/test_cyber_time_py3.py

@@ -22,8 +22,8 @@ import sys
 import time
 import unittest
 
-from cyber_py import cyber_py3 as cyber
-from cyber_py import cyber_time_py3 as cyber_time
+from cyber_py3 import cyber
+from cyber_py3 import cyber_time
 
 
 class TestTime(unittest.TestCase):

cyber/python/test/test_cyber_timer_py3.py → cyber/python/cyber_py3/test/test_cyber_timer_py3.py

@@ -21,8 +21,8 @@
 import time
 import unittest
 
-from cyber_py import cyber_py3 as cyber
-from cyber_py import cyber_timer_py3 as cyber_timer
+from cyber_py3 import cyber
+from cyber_py3 import cyber_timer
 
 
 class TestCyberTimer(unittest.TestCase):

cyber/python/test/test_init_py3.py → cyber/python/cyber_py3/test/test_init_py3.py

@@ -22,7 +22,7 @@ import sys
 import unittest
 
 sys.path.append("../")
-from cyber_py import cyber_py3 as cyber
+from cyber_py3 import cyber
 
 
 class TestInit(unittest.TestCase):

cyber/python/test/test_parameter_py3.py → cyber/python/cyber_py3/test/test_parameter_py3.py

@@ -22,8 +22,8 @@ import sys
 import unittest
 import time
 
-from cyber_py import cyber_py3 as cyber
-from cyber_py import parameter_py3 as parameter
+from cyber_py3 import cyber
+from cyber_py3 import parameter
 
 PARAM_SERVICE_NAME = "global_parameter_service"
 

cyber/python/test/test_record_py3.py → cyber/python/cyber_py3/test/test_record_py3.py

@@ -23,7 +23,7 @@ import unittest
 
 sys.path.append("../")
 from cyber.proto import record_pb2
-from cyber_py import record_py3 as record
+from cyber_py3 import record
 from modules.common.util.testdata.simple_pb2 import SimpleMessage