import re
from CRC import do_crc
from select import select
+import socket, logging
asynchronous_responses = [ '400', '401', # door open/closed
'610', # switches changed
try:
s = self.rfh.read(1)
except socket.error:
- print "Blah, seems DEC server has fallen over"
raise VendingException('failed to read input from vending machine')
if s == '': raise VendingException('nothing read!')
+ if (s != '#' and s != '%') and state == 1: prefix += s
if s == '\n' or s == '\r':
state = 1
prefix = ''
s = ''
while s == '':
s = self.rfh.readline()
- if s == '': return None
+ if s == '':
+ raise VendingException('Input socket has closed!')
s = s.strip('\r\n')
code = s[0:3]
text = s[4:]
elif code[0] == '2':
self.events.append((KEY, int(code[1:3])))
else:
- sys.stderr.write('WARNING: Unhandled event! (%s %s)\n'%(code,text))
+ logging.warning('Unhandled event! (%s %s)\n'%(code,text))
def authed_message(self, message):
if self.challenge == None:
def vend(self, item):
if not re.search('^[0-9][0-9]$', item):
return (False, 'Invalid item requested (%s)'%item)
- self.wfh.write(self.authed_message(('V%s\n'%item)+'\n'))
+ self.wfh.write(self.authed_message(('V%s'%item))+'\n')
(code, string) = self.get_response()
return (code == '100', code, string)