From f816ba155b26bbcb5c7ad18e1b5d596c8b98d2c1 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Mon, 21 Aug 2017 15:46:44 +0100
Subject: [PATCH] Removed ZMQSocketURL as it's now only living in the UI
---
force_bdss/api.py | 2 +-
force_bdss/local_traits.py | 24 +-----------------------
force_bdss/tests/test_local_traits.py | 22 +---------------------
3 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/force_bdss/api.py b/force_bdss/api.py
index fa2fddd..f7501e0 100644
--- a/force_bdss/api.py
+++ b/force_bdss/api.py
@@ -28,4 +28,4 @@ from .notification_listeners.base_notification_listener import BaseNotificationL
from .notification_listeners.base_notification_listener_factory import BaseNotificationListenerFactory # noqa
from .notification_listeners.base_notification_listener_model import BaseNotificationListenerModel # noqa
-from .local_traits import (ZMQSocketURL, Identifier) # noqa
+from .local_traits import Identifier # noqa
diff --git a/force_bdss/local_traits.py b/force_bdss/local_traits.py
index f2aa385..f759aed 100644
--- a/force_bdss/local_traits.py
+++ b/force_bdss/local_traits.py
@@ -1,32 +1,10 @@
-import re
-from traits.api import Regex, BaseStr, String
+from traits.api import Regex, String
#: Used for variable names, but allow also empty string as it's the default
#: case and it will be present if the workflow is saved before actually
#: specifying the value.
Identifier = Regex(regex="(^[^\d\W]\w*\Z|^\Z)")
-
-class ZMQSocketURL(BaseStr):
- def validate(self, object, name, value):
- super(ZMQSocketURL, self).validate(object, name, value)
- m = re.match(
- "tcp://(\\d{1,3})\.(\\d{1,3})\.(\\d{1,3})\.(\\d{1,3}):(\\d+)",
- value)
- if m is None:
- self.error(object, name, value)
-
- a, b, c, d, port = m.groups()
-
- if not all(map(lambda x: 0 <= int(x) <= 255, (a, b, c, d))):
- self.error(object, name, value)
-
- if not (1 <= int(port) <= 65535):
- self.error(object, name, value)
-
- return value
-
-
#: Identifies a CUBA type with its key. At the moment a String with
#: no validation, but will come later.
CUBAType = String()
diff --git a/force_bdss/tests/test_local_traits.py b/force_bdss/tests/test_local_traits.py
index d66a863..d61e6d2 100644
--- a/force_bdss/tests/test_local_traits.py
+++ b/force_bdss/tests/test_local_traits.py
@@ -1,13 +1,12 @@
import unittest
from traits.api import HasStrictTraits, TraitError
-from force_bdss.local_traits import Identifier, CUBAType, ZMQSocketURL
+from force_bdss.local_traits import Identifier, CUBAType
class Traited(HasStrictTraits):
val = Identifier()
cuba = CUBAType()
- socket_url = ZMQSocketURL()
class TestLocalTraits(unittest.TestCase):
@@ -26,22 +25,3 @@ class TestLocalTraits(unittest.TestCase):
c = Traited()
c.cuba = "PRESSURE"
self.assertEqual(c.cuba, "PRESSURE")
-
- def test_zmq_socket_url(self):
- c = Traited()
-
- for working in ["tcp://127.0.0.1:12345",
- "tcp://255.255.255.255:65535",
- "tcp://1.1.1.1:65535"]:
- c.socket_url = working
- self.assertEqual(c.socket_url, working)
-
- for broken in ["tcp://270.0.0.1:12345",
- "tcp://0.270.0.1:12345",
- "tcp://0.0.270.1:12345",
- "tcp://0.0.0.270:12345",
- "url://255.255.255.255:65535",
- "whatever",
- "tcp://1.1.1.1:100000"]:
- with self.assertRaises(TraitError):
- c.socket_url = broken
--
GitLab