better string splitting

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1700 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/roundup/admin.py b/roundup/admin.py
index 2641526ff9be7ce1fb17e9a8d292f07281cffbe4..5e234123b181e94ee3d52d2e5b51dba4547a8757 100644 (file)
--- a/roundup/admin.py
+++ b/roundup/admin.py
@@ -16,12 +16,12 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: admin.py,v 1.52 2003-04-17 07:33:08 richard Exp $
+# $Id: admin.py,v 1.53 2003-05-09 03:32:41 richard Exp $
 
 '''Administration commands for maintaining Roundup trackers.
 '''
 
-import sys, os, getpass, getopt, re, UserDict, shlex, shutil, rfc822
+import sys, os, getpass, getopt, re, UserDict, shutil, rfc822
 try:
     import csv
 except ImportError:

diff --git a/roundup/cgi/client.py b/roundup/cgi/client.py
index 97df1733b750fdfca9aa726b56ea4f137002d686..f85d695fd09de7391a89eeac621d67cb98024d82 100644 (file)
--- a/roundup/cgi/client.py
+++ b/roundup/cgi/client.py
@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.115 2003-05-09 01:47:50 richard Exp $
+# $Id: client.py,v 1.116 2003-05-09 03:32:41 richard Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -8,7 +8,7 @@ import os, os.path, cgi, StringIO, urlparse, re, traceback, mimetypes, urllib
 import binascii, Cookie, time, random, MimeWriter, smtplib, socket, quopri
 import stat, rfc822, string
 
-from roundup import roundupdb, date, hyperdb, password
+from roundup import roundupdb, date, hyperdb, password, token
 from roundup.i18n import _
 from roundup.cgi.templating import Templates, HTMLRequest, NoTemplate
 from roundup.cgi import cgitb
@@ -1323,8 +1323,8 @@ You should then receive another email with the new password.
                     continue
                 if isinstance(props[key], hyperdb.String):
                     v = self.form[key].value
-                    l = wcre.split(v)
-                    if len(l) > 1:
+                    l = token.token_split(v)
+                    if len(l) > 1 or l[0] != v:
                         self.form.value.remove(self.form[key])
                         # replace the single value with the split list
                         for v in l: