Skip to content

Commit feec411

Browse files
committed
pylint errors
1 parent b88ad95 commit feec411

9 files changed

Lines changed: 67 additions & 66 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ old
1515
dist
1616
*.egg-info
1717
*.swp
18-
18+
newdocs

‎opcua/common/instanciate.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class _ReadAdder(object):
1212
"""
1313
Internal
1414
"""
15+
1516
def __init__(self, server, nodeid):
1617
self.server = server
1718
self.nodeid = nodeid
@@ -31,31 +32,31 @@ def read(self):
3132
for idx, val in enumerate(vals):
3233
if not val.StatusCode.is_good():
3334
print(val)
34-
print("Error attribute %s is not valid for node %s" % ( self._debug_attr[idx], self.nodeid))
35-
#val.StatusCode.check()
35+
print("Error attribute %s is not valid for node %s" % (self._debug_attr[idx], self.nodeid))
36+
# val.StatusCode.check()
3637
new_vals.append(val.Value.Value)
3738
return new_vals
3839

3940

40-
#def _read_attributed(server, nodeid, attrs_obj, *attrs):
41+
# def _read_attributed(server, nodeid, attrs_obj, *attrs):
4142
#ra = _ReadAdder(server, rdesc.NodeId)
42-
#for attr in attrs:
43-
#ra.add(atttr)
43+
# for attr in attrs:
44+
# ra.add(atttr)
4445
#vals = ra.read()
4546

4647
def instanciate_node(parent, node_type, idx):
4748
"""
4849
Instanciate a new node under 'parent' using a type
4950
"""
50-
51+
5152
results = node_type.get_attributes([ua.AttributeIds.NodeClass, ua.AttributeIds.BrowseName, ua.AttributeIds.DisplayName])
5253
nclass, bname, dname = [res.Value.Value for res in results]
5354

5455
#descs = node_type.get_children_descriptions(refs=ua.ObjectIds.HasTypeDefinition)
5556
typedef = ua.FourByteNodeId(ua.ObjectIds.BaseObjectType)
56-
#if len(descs) > 1:
57-
#print("DESCS", descs)
58-
#typedef = descs[0].TypeDefinition
57+
# if len(descs) > 1:
58+
#print("DESCS", descs)
59+
#typedef = descs[0].TypeDefinition
5960

6061
rdesc = ua.ReferenceDescription()
6162
rdesc.NodeId = node_type.nodeid
@@ -113,7 +114,7 @@ def _instanciate_node(server, parentid, rdesc, idx):
113114
refs.append(ref)
114115
server.add_references(refs)
115116

116-
descs = node_type.get_children_descriptions(includesubtypes=False) #FIXME: should be false
117+
descs = node_type.get_children_descriptions(includesubtypes=False) # FIXME: should be false
117118
print("node is", rdesc.NodeId, node_type, node_type.get_children())
118119
print("Children are: ", descs)
119120
for rdesc in descs:
@@ -139,9 +140,9 @@ def _add_object_attrs(addnode, node_type):
139140
if results[1].StatusCode.is_good():
140141
attrs.WriteMask = results[1].Value.Value
141142
if results[2].StatusCode.is_good():
142-
attrs.UserWriteMask = results[2].Value.Value
143+
attrs.UserWriteMask = results[2].Value.Value
143144
if results[3].StatusCode.is_good():
144-
attrs.UserWriteMask = results[3].Value.Value
145+
attrs.UserWriteMask = results[3].Value.Value
145146

146147
addnode.NodeAttributes = attrs
147148

@@ -166,18 +167,18 @@ def _read_and_copy_attrs(node_type, struct, addnode):
166167

167168
def _add_variable_attrs(addnode, rdesc, node_type):
168169
results = node_type.get_attributes([
169-
ua.AttributeIds.EventNotifier,
170-
ua.AttributeIds.Description,
171-
ua.AttributeIds.WriteMask,
172-
ua.AttributeIds.UserWriteMask,
173-
ua.AttributeIds.Value,
174-
ua.AttributeIds.DataType,
175-
ua.AttributeIds.ValueRank,
176-
ua.AttributeIds.ArrayDimentions,
177-
ua.AttributeIds.AccessLevel,
178-
ua.AttributeIds.UserAccessLevel,
179-
ua.AttributeIds.MinimumSamplingInterval,
180-
ua.AttributeIds.Historizing])
170+
ua.AttributeIds.EventNotifier,
171+
ua.AttributeIds.Description,
172+
ua.AttributeIds.WriteMask,
173+
ua.AttributeIds.UserWriteMask,
174+
ua.AttributeIds.Value,
175+
ua.AttributeIds.DataType,
176+
ua.AttributeIds.ValueRank,
177+
ua.AttributeIds.ArrayDimentions,
178+
ua.AttributeIds.AccessLevel,
179+
ua.AttributeIds.UserAccessLevel,
180+
ua.AttributeIds.MinimumSamplingInterval,
181+
ua.AttributeIds.Historizing])
181182

182183
attrs = ua.ObjectAttributes()
183184
if results[0].is_good():
@@ -188,7 +189,7 @@ def _add_variable_attrs(addnode, rdesc, node_type):
188189
attrs.WriteMask = results[2].Value.Value
189190
if results[3].is_good():
190191
attrs.UserWriteMask = results[3].Value.Value
191-
#if results[4].is_good():
192+
# if results[4].is_good():
192193
#attrs.Value = results[4].Value.Value
193194
if results[5].is_good():
194195
attrs.DataType = results[5].Value.Value
@@ -207,8 +208,7 @@ def _add_variable_attrs(addnode, rdesc, node_type):
207208

208209
addnode.NodeAttributes = attrs
209210

211+
210212
def _set_attr(container, result, idx):
211213
if result.is_good():
212214
container = result.Value.Value
213-
214-

‎opcua/server/address_space.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def _add_node(self, item, user):
201201
result.StatusCode = ua.StatusCode(ua.StatusCodes.BadParentNodeIdInvalid)
202202
return result
203203
else:
204-
if not user == User.Admin:
204+
if user != User.Admin:
205205
result.StatusCode = ua.StatusCode(ua.StatusCodes.BadUserAccessDenied)
206206
return result
207207

@@ -240,7 +240,7 @@ def delete_nodes(self, deletenodeitems, user=User.Admin):
240240
return results
241241

242242
def _delete_node(self, item, user):
243-
if not user == User.Admin:
243+
if user != User.Admin:
244244
return ua.StatusCode(ua.StatusCodes.BadUserAccessDenied)
245245

246246
if item.NodeId not in self._aspace:
@@ -266,7 +266,7 @@ def _delete_node_callbacks(self, nodedata):
266266
callback(handle, None, ua.StatusCode(ua.StatusCodes.BadNodeIdUnknown))
267267
self._aspace.delete_datachange_callback(handle)
268268
except Exception as ex:
269-
self.logger.exception("Error calling datachange callback %s, %s, %s", k, v, ex)
269+
self.logger.exception("Error calling delete node callback callback %s, %s, %s", nodedata, ua.AttributeIds.Value, ex)
270270

271271
def add_references(self, refs, user=User.Admin):
272272
result = []
@@ -279,7 +279,7 @@ def _add_reference(self, addref, user):
279279
return ua.StatusCode(ua.StatusCodes.BadSourceNodeIdInvalid)
280280
if addref.TargetNodeId not in self._aspace:
281281
return ua.StatusCode(ua.StatusCodes.BadTargetNodeIdInvalid)
282-
if not user == User.Admin:
282+
if user != User.Admin:
283283
return ua.StatusCode(ua.StatusCodes.BadUserAccessDenied)
284284
rdesc = ua.ReferenceDescription()
285285
rdesc.ReferenceTypeId = addref.ReferenceTypeId
@@ -306,20 +306,20 @@ def _delete_reference(self, item, user):
306306
return ua.StatusCode(ua.StatusCodes.BadSourceNodeIdInvalid)
307307
if item.TargetNodeId not in self._aspace:
308308
return ua.StatusCode(ua.StatusCodes.BadTargetNodeIdInvalid)
309-
if not user == User.Admin:
309+
if user != User.Admin:
310310
return ua.StatusCode(ua.StatusCodes.BadUserAccessDenied)
311311

312312
for rdesc in self._aspace[item.SourceNodeId].references:
313313
if rdesc.NodeId is item.TargetNodeId:
314314
if rdesc.RefrenceTypeId != item.RefrenceTypeId:
315-
return ua.StatusCode(ua.StatusCode.BadReferenceTypeInvalid)
315+
return ua.StatusCode(ua.StatusCodes.BadReferenceTypeIdInvalid)
316316
if rdesc.IsForward == item.IsForward or item.DeleteBidirectional:
317317
self._aspace[item.SourceNodeId].references.remove(rdesc)
318318

319319
for rdesc in self._aspace[item.TargetNodeId].references:
320320
if rdesc.NodeId is item.SourceNodeId:
321321
if rdesc.RefrenceTypeId != item.RefrenceTypeId:
322-
return ua.StatusCode(ua.StatusCode.BadReferenceTypeInvalid)
322+
return ua.StatusCode(ua.StatusCodes.BadReferenceTypeIdInvalid)
323323
if rdesc.IsForward == item.IsForward or item.DeleteBidirectional:
324324
self._aspace[item.SourceNodeId].references.remove(rdesc)
325325

‎opcua/server/internal_server.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ def __init__(self, internal_server, aspace, submgr, name, user=User.Anonymous, e
161161
self.subscription_service = submgr
162162
self.name = name
163163
self.user = user
164+
self.nonce = None
164165
self.state = SessionState.Created
165166
self.session_id = ua.NodeId(self._counter)
166167
InternalSession._counter += 1

‎opcua/server/internal_subscription.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ def __init__(self):
1717
self.monitored_item_id = None
1818
self.parameters = None
1919
self.mode = None
20+
self.mfilter = None
2021

2122

2223
class MonitoredItemService(object):
@@ -123,7 +124,7 @@ def delete_monitored_items(self, ids):
123124
return results
124125

125126
def _delete_monitored_items(self, mid):
126-
if not mid in self._monitored_items:
127+
if mid not in self._monitored_items:
127128
return ua.StatusCode(ua.StatusCodes.BadMonitoredItemIdInvalid)
128129
for k, v in self._monitored_events.items():
129130
if v == mid:
@@ -153,12 +154,12 @@ def datachange_callback(self, handle, value, error=None):
153154

154155
def trigger_event(self, event):
155156
with self._lock:
156-
if not event.SourceNode in self._monitored_events:
157+
if event.SourceNode not in self._monitored_events:
157158
self.logger.debug("%s has no subscription for events %s from node: %s", self, event, event.SourceNode)
158159
return False
159160
self.logger.debug("%s has subscription for events %s from node: %s", self, event, event.SourceNode)
160161
mid = self._monitored_events[event.SourceNode]
161-
if not mid in self._monitored_items:
162+
if mid not in self._monitored_items:
162163
self.logger.debug("Could not find monitored items for id %s for event %s in subscription %s", mid, event, self)
163164
return False
164165
mdata = self._monitored_items[mid]

‎opcua/server/server.py‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def register_to_discovery(self, url="opc.tcp://localhost:4840", period=60):
125125
re-register every period seconds
126126
if period is 0 registration is not automatically renewed
127127
"""
128-
# FIXME: habe a period per discovery
128+
# FIXME: habe a period per discovery
129129
if url in self._discovery_clients:
130130
self._discovery_clients[url].disconnect()
131131
self._discovery_clients[url] = Client(url)
@@ -174,28 +174,32 @@ def _setup_server_nodes(self):
174174
if self.certificate and self.private_key:
175175
self._set_endpoints(security_policies.SecurityPolicyBasic128Rsa15,
176176
ua.MessageSecurityMode.SignAndEncrypt)
177-
self._policies.append(ua.SecurityPolicyFactory(
178-
security_policies.SecurityPolicyBasic128Rsa15,
179-
ua.MessageSecurityMode.SignAndEncrypt,
180-
self.certificate, self.private_key))
177+
self._policies.append(ua.SecurityPolicyFactory(security_policies.SecurityPolicyBasic128Rsa15,
178+
ua.MessageSecurityMode.SignAndEncrypt,
179+
self.certificate,
180+
self.private_key)
181+
)
181182
self._set_endpoints(security_policies.SecurityPolicyBasic128Rsa15,
182183
ua.MessageSecurityMode.Sign)
183-
self._policies.append(ua.SecurityPolicyFactory(
184-
security_policies.SecurityPolicyBasic128Rsa15,
185-
ua.MessageSecurityMode.Sign,
186-
self.certificate, self.private_key))
184+
self._policies.append(ua.SecurityPolicyFactory(security_policies.SecurityPolicyBasic128Rsa15,
185+
ua.MessageSecurityMode.Sign,
186+
self.certificate,
187+
self.private_key)
188+
)
187189
self._set_endpoints(security_policies.SecurityPolicyBasic256,
188190
ua.MessageSecurityMode.SignAndEncrypt)
189-
self._policies.append(ua.SecurityPolicyFactory(
190-
security_policies.SecurityPolicyBasic256,
191-
ua.MessageSecurityMode.SignAndEncrypt,
192-
self.certificate, self.private_key))
191+
self._policies.append(ua.SecurityPolicyFactory(security_policies.SecurityPolicyBasic256,
192+
ua.MessageSecurityMode.SignAndEncrypt,
193+
self.certificate,
194+
self.private_key)
195+
)
193196
self._set_endpoints(security_policies.SecurityPolicyBasic256,
194197
ua.MessageSecurityMode.Sign)
195-
self._policies.append(ua.SecurityPolicyFactory(
196-
security_policies.SecurityPolicyBasic256,
197-
ua.MessageSecurityMode.Sign,
198-
self.certificate, self.private_key))
198+
self._policies.append(ua.SecurityPolicyFactory(security_policies.SecurityPolicyBasic256,
199+
ua.MessageSecurityMode.Sign,
200+
self.certificate,
201+
self.private_key)
202+
)
199203

200204
def _set_endpoints(self, policy=ua.SecurityPolicy, mode=ua.MessageSecurityMode.None_):
201205
idtoken = ua.UserTokenPolicy()
@@ -309,7 +313,7 @@ def register_namespace(self, uri):
309313
uries = ns_node.get_value()
310314
uries.append(uri)
311315
ns_node.set_value(uries)
312-
return (len(uries) - 1)
316+
return len(uries) - 1
313317

314318
def get_namespace_index(self, uri):
315319
"""
@@ -334,4 +338,3 @@ def import_xml(self, path):
334338

335339
def delete_nodes(self, nodes, recursive=False):
336340
return delete_nodes(self.iserver.isession, nodes, recursive)
337-

‎opcua/server/uaprocessor.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ def set_policies(self, policies):
3636
def send_response(self, requesthandle, algohdr, seqhdr, response, msgtype=ua.MessageType.SecureMessage):
3737
with self._socketlock:
3838
response.ResponseHeader.RequestHandle = requesthandle
39-
data = self._connection.message_to_binary(response.to_binary(),
40-
msgtype, seqhdr.RequestId)
39+
data = self._connection.message_to_binary(response.to_binary(), msgtype, seqhdr.RequestId)
4140
self.socket.write(data)
4241

4342
def open_secure_channel(self, algohdr, seqhdr, body):

‎opcua/tools.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import sys
33
import argparse
44
from datetime import datetime
5-
from enum import Enum
65
import math
76
import time
87

@@ -135,10 +134,7 @@ def _args_to_array(val, array):
135134

136135

137136
def _arg_to_bool(val):
138-
if val in ("true", "True"):
139-
return True
140-
else:
141-
return False
137+
return val in ("true", "True")
142138

143139

144140
def _arg_to_variant(val, array, ptype, varianttype=None):

‎opcua/ua/uaprotocol_hand.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
from opcua.ua import uaprotocol_auto as auto
77
from opcua.ua import uatypes
8+
from opcua.ua import UaError
89
from opcua.ua.uatypes import uatype_UInt32
910
from opcua.common import utils
1011

@@ -627,7 +628,7 @@ def receive_from_header_and_body(self, header, body):
627628
return msg
628629
elif header.MessageType == MessageType.Error:
629630
msg = ErrorMessage.from_binary(body)
630-
logger.warning("Received an error: {}".format(msg))
631+
logger.warning("Received an error: %s", msg)
631632
return msg
632633
else:
633634
raise UaError("Unsupported message type {}".format(header.MessageType))
@@ -653,7 +654,7 @@ def _receive(self, msg):
653654
return None
654655
if msg.MessageHeader.ChunkType == ChunkType.Abort:
655656
err = ErrorMessage.from_binary(utils.Buffer(msg.Body))
656-
logger.warning("Message {} aborted: {}".format(msg, err))
657+
logger.warning("Message %s aborted: %s", msg, err)
657658
# specs Part 6, 6.7.3 say that aborted message shall be ignored
658659
# and SecureChannel should not be closed
659660
self._incoming_parts = []

0 commit comments

Comments
 (0)