X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=flashpolicy%2Fsfa_flashpolicy.py;h=1fe3f84459599e5af28e3d3b1e87e1a16d6a10e4;hb=a0ef6e7c91c3c8fa376943d28fec8c5c204a78cd;hp=8ccdc00ef11a993f4c10eec363a58b4ade1e4eb8;hpb=3c9b4d0e434d536c471d225e01723a61af544cb1;p=sfa.git

diff --git a/flashpolicy/sfa_flashpolicy.py b/flashpolicy/sfa_flashpolicy.py
index 8ccdc00e..1fe3f844 100644
--- a/flashpolicy/sfa_flashpolicy.py
+++ b/flashpolicy/sfa_flashpolicy.py
@@ -63,7 +63,7 @@ class policy_server(object):
         try:
             while True:
                 thread.start_new_thread(self.handle, self.sock.accept())
-        except socket.error, e:
+        except socket.error as e:
             self.log('Error accepting connection: %s' % (e[1],))
     def handle(self, conn, addr):
         addrstr = '%s:%s' % (addr[0],addr[1])
@@ -73,15 +73,15 @@ class policy_server(object):
                 # It's possible that we won't get the entire request in
                 # a single recv, but very unlikely.
                 request = conn.recv(1024).strip()
-                if request != '<policy-file-request/>\0':
-                    self.log('Unrecognized request from %s: %s' % (addrstr, request))
-                    return
+                #if request != '<policy-file-request/>\0':
+                #    self.log('Unrecognized request from %s: %s' % (addrstr, request))
+                #    return
                 self.log('Valid request received from %s' % (addrstr,))
                 conn.sendall(self.policy)
                 self.log('Sent policy file to %s' % (addrstr,))
-        except socket.error, e:
+        except socket.error as e:
             self.log('Error handling connection from %s: %s' % (addrstr, e[1]))
-        except Exception, e:
+        except Exception as e:
             self.log('Error handling connection from %s: %s' % (addrstr, e[1]))
     def log(self, str):
         print >>sys.stderr, str
@@ -105,7 +105,7 @@ def main():
         if opts.daemon:
             daemon()
         policy_server(opts.port, opts.path).run()
-    except Exception, e:
+    except Exception as e:
         print >> sys.stderr, e
         sys.exit(1)
     except KeyboardInterrupt: