Moved class variable ErtServer <-> ErtClient.

devel/python/python/ert/server/__init__.py

@@ -1,4 +1,4 @@
+from .ert_client import ErtClient
 from .ert_server import ErtServer, ERROR , SUCCESS
 from .ert_socket import ErtSocket
-from .ert_client import ErtClient
 from .run_context import RunContext

devel/python/python/ert/server/ert_client.py

@@ -19,7 +19,6 @@
 import json
 import datetime
 import time
-from ert.server import ErtServer
 
 class ServerReturnedNoneException(Exception):
     pass
@@ -28,6 +27,8 @@ class ConnectionErrorException(Exception):
     pass
 
 class ErtClient(object):
+    DATE_FORMAT = '%Y-%m-%d %H:%M:%S'
+
     def __init__(self , port , host):
         self.socket = socket.socket( socket.AF_INET , socket.SOCK_STREAM)
         self.port = port
@@ -44,7 +45,7 @@ def convert_to_datetime(data):
         result = []
         for d in data:
             try:
-                result.append(datetime.datetime.strptime(d, ErtServer.DATE_FORMAT))
+                result.append(datetime.datetime.strptime(d, ErtClient.DATE_FORMAT))
             except:
                 pass
         return result

devel/python/python/ert/server/ert_server.py

@@ -28,6 +28,7 @@
 from ert.enkf import NodeId
 from ert.util import installAbortSignals
 
+from .ert_client import ErtClient
 from .run_context import RunContext
 
 # The server will always return SUCCESS(), or alternatively raise an
@@ -49,7 +50,6 @@ def ERROR(msg , exception = None):
 
 
 class ErtServer(object):
-    DATE_FORMAT = '%Y-%m-%d %H:%M:%S'
     site_config = None
 
     def __init__(self , config , logger=None):
@@ -278,6 +278,6 @@ def handleTIMESTEP(self, args):
         enkf_fs_manager = self.ert_handle.getEnkfFsManager()
         enkf_fs = enkf_fs_manager.getCurrentFileSystem()
         time_map = enkf_fs.getTimeMap()
-        time_steps = [ ts.datetime().strftime(ErtServer.DATE_FORMAT) for ts in time_map ]
+        time_steps = [ ts.datetime().strftime(ErtClient.DATE_FORMAT) for ts in time_map ]
 
         return self.SUCCESS(time_steps)