Skip to content

Commit bc7fee6

Browse files
committed
Set representation
1 parent 0a82a9e commit bc7fee6

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

scan/commands/set.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,21 +107,22 @@ def __repr__(self):
107107
result += ", '%s'" % self.__value
108108
else:
109109
result += ", %s" % str(self.__value)
110-
use_timeout = False
111110
if self.__completion:
112-
use_timeout = True
113111
result += ', completion=True'
112+
result += ', timeout='+str(self.__timeout)
114113
if isinstance(self.__readback, str):
115-
use_timeout = True
116114
result += ", readback='%s'" % self.__readback
115+
result += ", tolerance='%f'" % self.__tolerance
116+
if not self.__completion and self.__timeout!=0.0:
117+
result += ', timeout='+str(self.__timeout)
117118
elif self.__readback:
118-
use_timeout = True
119119
result += ", readback=%s" % str(self.__readback)
120-
if use_timeout and self.__timeout!=0.0:
121-
result += ', timeout='+str(self.__timeout)
120+
result += ", tolerance='%f'" % self.__tolerance
121+
if not self.__completion and self.__timeout!=0.0:
122+
result += ', timeout='+str(self.__timeout)
122123
if self.__errHandler:
123124
result += ", errhandler='%s'" % self.__errHandler
124125
result+=')'
125126
return result
126127

127-
128+

scan/version.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11

2-
__version__ = '1.4.0'
2+
__version__ = '1.4.1'
33

44
version_history = """
5+
1.4.1 - Better Set(..) representation
56
1.4.0 - Jython uses Java HTTP API, CPython uses urllib2
67
1.3.12 - Add Parallel.append(..) method
78
1.3.11 - Fix list-of-lists check

0 commit comments

Comments
 (0)