[Moin-devel] CVS: MoinMoin eventlog.py,1.4,1.5 util.py,1.34,1.35

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv10272

Modified Files:
	eventlog.py util.py 
Log Message:
Adapted drawing support to CGI-based attachment access


Index: eventlog.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/eventlog.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** eventlog.py	6 Feb 2002 10:42:20 -0000	1.4
--- eventlog.py	7 Feb 2002 11:37:34 -0000	1.5
***************
*** 14,18 ****
  # Imports
  import os, string, time, urllib
! from MoinMoin import config
  
  
--- 14,18 ----
  # Imports
  import os, string, time, urllib
! from MoinMoin import config, util
  
  
***************
*** 62,71 ****
              time, eventtype, kvpairs = string.split(string.rstrip(event), '\t')
              if filter and eventtype not in filter: continue
!             values = {}
!             pairs = string.split(kvpairs, '&')
!             for pair in pairs:
!                 key, val = string.split(pair, '=')
!                 values[urllib.unquote(key)] = urllib.unquote(val)
!             data.append((float(time), eventtype, values))
  
          return data
--- 62,66 ----
              time, eventtype, kvpairs = string.split(string.rstrip(event), '\t')
              if filter and eventtype not in filter: continue
!             data.append((float(time), eventtype, util.parseQueryString(kvpairs)))
  
          return data

Index: util.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/util.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** util.py	31 Jan 2002 21:31:22 -0000	1.34
--- util.py	7 Feb 2002 11:37:34 -0000	1.35
***************
*** 199,200 ****
--- 199,213 ----
      return result
  
+ 
+ def parseQueryString(qstr):
+     """ Parse a querystring "key=value&..." into a dict.
+     """
+     import urllib
+ 
+     values = {}
+     pairs = string.split(qstr, '&')
+     for pair in pairs:
+         key, val = string.split(pair, '=')
+         values[urllib.unquote(key)] = urllib.unquote(val)
+ 
+     return values