git.ucc.asn.au
/
uccvend-vendserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix stupid crypto bug
[uccvend-vendserver.git]
/
sql-edition
/
servers
/
VendingMachine.py
diff --git
a/sql-edition/servers/VendingMachine.py
b/sql-edition/servers/VendingMachine.py
index
4a40922
..
d7e7a8f
100644
(file)
--- a/
sql-edition/servers/VendingMachine.py
+++ b/
sql-edition/servers/VendingMachine.py
@@
-44,6
+44,7
@@
class VendingMachine:
except socket.error:
raise VendingException('failed to read input from vending machine')
if s == '': raise VendingException('nothing read!')
except socket.error:
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 = ''
if s == '\n' or s == '\r':
state = 1
prefix = ''
@@
-114,7
+115,7
@@
class VendingMachine:
def vend(self, item):
if not re.search('^[0-9][0-9]$', item):
return (False, 'Invalid item requested (%s)'%item)
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)
(code, string) = self.get_response()
return (code == '100', code, string)
UCC
git Repository :: git.ucc.asn.au