[py-svn] r35127 - in py/branch/test-web-multiclient/py/test/rsession: . webdata

[fijal at codespeak.net]

Author: fijal
Date: Wed Nov 29 16:55:57 2006
New Revision: 35127

Modified:
   py/branch/test-web-multiclient/py/test/rsession/web.py
   py/branch/test-web-multiclient/py/test/rsession/webdata/source.js
Log:
Fixed multiplayer semantics.


Modified: py/branch/test-web-multiclient/py/test/rsession/web.py
==============================================================================
--- py/branch/test-web-multiclient/py/test/rsession/web.py	(original)
+++ py/branch/test-web-multiclient/py/test/rsession/web.py	Wed Nov 29 16:55:57 2006
@@ -81,12 +81,12 @@
         self._lock.acquire()
         try:
             self._cache.append(item)
-            for q in self._session_queues.values():
+            for key, q in self._session_queues.items():
                 q.put(item)
         finally:
             self._lock.release()
 
-    def get(self, sessid=-1):
+    def get(self, sessid):
         self._lock.acquire()
         try:
             if not sessid in self._session_queues:
@@ -107,6 +107,9 @@
             self._lock.release()
         return True
 
+    def empty_queue(self, sessid):
+        return self._session_queues[sessid].empty()
+
     def _create_session_queue(self, sessid):
         self._session_queues[sessid] = q = Queue.Queue()
         for item in self._cache:
@@ -174,7 +177,7 @@
     
     def show_all_statuses(self, sessid=-1):
         retlist = [self.show_status_change(sessid)]
-        while not self.pending_events.empty():
+        while not self.pending_events.empty_queue(sessid):
             retlist.append(self.show_status_change(sessid))
         retval = json.write(retlist)
         return retval

Modified: py/branch/test-web-multiclient/py/test/rsession/webdata/source.js
==============================================================================
Binary files. No diff available.