fix Bernard's indentation again

[uccvend-vendserver.git] / sql-edition / servers / VendingMachine.py

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index e242df8..d86cc3f 100644 (file)
--- a/sql-edition/servers/VendingMachine.py
+++ b/sql-edition/servers/VendingMachine.py
@@ -1,5 +1,5 @@
 # vim:ts=4
-import re, pg
+import re
 from CRC import do_crc
 from select import select
 
@@ -12,6 +12,8 @@ DOOR = 1
 SWITCH = 2
 KEY = 3
 
+class VendingException(Exception): pass
+
 class VendingMachine:
        def __init__(self, rfh, wfh):
                self.events = []
@@ -27,7 +29,7 @@ class VendingMachine:
                self.wfh.write('PING\n')
                code = ''
                while code != '000':
-                       (code, _) = self.get_response()
+                       code = self.get_response()[0]
                self.get_switches()
 
        def await_prompt(self):
@@ -36,8 +38,12 @@ class VendingMachine:
                prefix = ''
                s = ''
                while True:
-                       s = self.rfh.read(1)
-                       if s == '': raise Exception('nothing read!')
+                       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 == '\n' or s == '\r':
                                state = 1
                                prefix = ''
@@ -56,7 +62,8 @@ class VendingMachine:
                        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:]