Restructure file folders

libs/server/__init__.py

@@ -0,0 +1 @@
+__author__ = 'pmdartus'

libs/nanocube.py → libs/server/nanocube.py

@@ -1,6 +1,7 @@
 import sys
-from node import Node
-from timeserietable import TimeSerieTable
+
+from libs.server.node import Node
+from libs.server.timeserietable import TimeSerieTable
 
 
 class NanoCube(object):

libs/querybuilder.py → libs/server/querybuilder.py

@@ -1,5 +1,3 @@
-from timeserietable import TimeSerieTable
-
 class QueryBuilder(object):
     def __init__(self, cube, **kwargs):
         super(QueryBuilder, self).__init__()

libs/serializer.py → libs/server/serializer.py

@@ -1,8 +1,9 @@
 import io
 import re
-from nanocube import NanoCube
-from node import Node
-from timeserietable import TimeSerieTable
+
+from libs.server.nanocube import NanoCube
+from libs.server.node import Node
+from libs.server.timeserietable import TimeSerieTable
 
 
 def dumps(cube):
@@ -104,6 +105,7 @@ def _dump_cube(cube, stream):
 
 
 def _dump_nodes(node, stream):
+
     if not isinstance(node, TimeSerieTable):
         for key in node.proper_children:
             _dump_nodes(node.proper_children[key], stream)

libs/server.py → libs/server/server.py

@@ -1,11 +1,13 @@
 import argparse
-import zmq
-import yaml
 import datetime
 import csv
-import serializer as Serializer
 from threading import Thread
-from nanocube import NanoCube
+
+import zmq
+import yaml
+
+import libs.server.serializer as Serializer
+from libs.server.nanocube import NanoCube
 
 
 class ServerManager(object):

test/helpers.py

@@ -1,7 +1,9 @@
 import csv
 import datetime
 import os
-from libs.nanocube import NanoCube
+
+from server.nanocube import NanoCube
+
 
 samples = dict(
     simple=dict(

test/test_nanocube.py

@@ -1,8 +1,10 @@
-from nose.tools import assert_equals, assert_is_instance, assert_not_equals, assert_is_none
 from datetime import datetime
 from copy import copy
-from libs.timeserietable import TimeSerieTable
-from libs.nanocube import NanoCube
+
+from nose.tools import assert_equals, assert_is_instance, assert_is_none
+
+from libs.server.timeserietable import TimeSerieTable
+from libs.server.nanocube import NanoCube
 
 
 class TestNanoCube:

test/test_querybuilder.py

@@ -1,7 +1,9 @@
 from datetime import datetime
+
 from nose.tools import ok_, eq_
+
 from helpers import mock_cube
-from libs.querybuilder import QueryBuilder
+from server.querybuilder import QueryBuilder
 
 
 class TestQueryBuilder:

test/test_serializer.py

@@ -1,9 +1,11 @@
 import os
 from datetime import datetime
+
 from nose.tools import eq_
+
 from helpers import mock_cube
-from libs.querybuilder import QueryBuilder
-import libs.serializer as serializer
+from libs.server.querybuilder import QueryBuilder
+import libs.server.serializer as serializer
 
 
 class TestSerializer:

test/test_timeserietable.py

@@ -1,7 +1,3 @@
-from datetime import datetime
-from nose.tools import assert_equals
-from libs.timeserietable import TimeSerieTable
-
 '''
 class TestTimeSerieTable(object):
     def mock_time(self, hour, min, sec):