@@ -307,7 +307,7 @@ def command(self, cmd):
307307 cmd_name = cmd [0 :2 ] # All other cases: Command names are two letters long.
308308
309309 try :
310- response = self ._send_request ('command' , cmd , cmd_name )
310+ response = self ._send_request (cmd , cmd_name )
311311 if response is None :
312312 return False
313313 except (serial .SerialException , IOError , RuntimeError , OSError ):
@@ -342,7 +342,7 @@ def query(self, qry):
342342 qry_name = qry [0 :2 ] # Cases except QU: Query responses are two letters long.
343343
344344 try :
345- response = self ._send_request ('query' , qry , qry_name )
345+ response = self ._send_request (qry , qry_name )
346346 if response is None :
347347 return None
348348 except (serial .SerialException , IOError , RuntimeError , OSError ):
@@ -368,7 +368,7 @@ def query_statusbyte(self):
368368 return None
369369
370370 try :
371- response = self ._send_request ('query' , ' QG' , 'QG' )
371+ response = self ._send_request ('QG' , 'QG' )
372372 if response is None :
373373 return None
374374 except (serial .SerialException , IOError , RuntimeError , OSError ):
@@ -381,9 +381,8 @@ def query_statusbyte(self):
381381 except (TypeError , ValueError ):
382382 return None
383383
384- def _send_request (self , type , request , request_name , num_tries = 3 ):
384+ def _send_request (self , request , request_name , num_tries = 3 ):
385385 '''
386- `type` is 'command' or 'query'
387386 `request` is the command or query to send to the EBB
388387 `request_name` is the short name of `request`
389388 `num_tries` is the number of times to try if something went wrong. "1" means no retries.
@@ -441,7 +440,7 @@ def _send_request(self, type, request, request_name, num_tries = 3):
441440 if num_tries > 1 : # recursive case
442441 self .retry_count += 1
443442 self .port .reset_input_buffer () # clear out any inputs from EBB prior to the new request
444- response = self ._send_request (type , request , request_name , num_tries - 1 )
443+ response = self ._send_request (request , request_name , num_tries - 1 )
445444 return response
446445 else : # base case
447446 self .record_error ('\n EBB Serial Error.' + \
0 commit comments