git.ucc.asn.au
/
zanchey
/
dispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usable but ugly!
[zanchey/dispense2.git]
/
sql-edition
/
servers
/
VendingMachine.py
diff --git
a/sql-edition/servers/VendingMachine.py
b/sql-edition/servers/VendingMachine.py
index
2574c6d
..
18f3067
100644
(file)
--- a/
sql-edition/servers/VendingMachine.py
+++ b/
sql-edition/servers/VendingMachine.py
@@
-36,7
+36,7
@@
class VendingMachine:
s = ''
while True:
s = self.rfh.read(1)
s = ''
while True:
s = self.rfh.read(1)
- if s == '': raise Exception
+ if s == '': raise Exception
('nothing read!')
if s == '\n' or s == '\r':
state = 1
prefix = ''
if s == '\n' or s == '\r':
state = 1
prefix = ''
@@
-49,7
+49,7
@@
class VendingMachine:
self.challenge = int(prefix, 16)
return
self.challenge = int(prefix, 16)
return
- def get_response(self):
+ def get_response(self
, async = False
):
self.wfh.flush()
while True:
s = ''
self.wfh.flush()
while True:
s = ''
@@
-61,6
+61,7
@@
class VendingMachine:
text = s[4:]
if code in asynchronous_responses:
self.handle_event(code, text)
text = s[4:]
if code in asynchronous_responses:
self.handle_event(code, text)
+ if async: return None
else:
self.await_prompt()
return (code, text)
else:
self.await_prompt()
return (code, text)
@@
-147,10
+148,11
@@
class VendingMachine:
return None
def wait_for_events(self, timeout = None):
return None
def wait_for_events(self, timeout = None):
+ if self.events: return True
(r, _, _) = select([self.rfh], [], [], timeout)
if not r: return False
event_added = False
while True:
(r, _, _) = select([self.rfh], [], [], timeout)
if not r: return False
event_added = False
while True:
-
r.get_response(
)
+
self.get_response(async = True
)
(r, _, _) = select([self.rfh], [], [], 0)
if not r: return event_added
(r, _, _) = select([self.rfh], [], [], 0)
if not r: return event_added
UCC
git Repository :: git.ucc.asn.au