Skip to content

Commit 6613aef

Browse files
author
Richard Jones
committed
*** empty log message ***
1 parent 88ec82d commit 6613aef

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

roundup/cgi/client.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: client.py,v 1.21 2002-09-09 00:45:06 richard Exp $
1+
# $Id: client.py,v 1.22 2002-09-09 03:20:09 richard Exp $
22

33
__doc__ = """
44
WWW request handler (also used in the stand-alone server).
@@ -412,7 +412,7 @@ def header(self, headers=None, response=200):
412412

413413
def set_cookie(self, user, password):
414414
# TODO generate a much, much stronger session key ;)
415-
self.session = binascii.b2a_base64(repr(time.time())).strip()
415+
self.session = binascii.b2a_base64(repr(random.random())).strip()
416416

417417
# clean up the base64
418418
if self.session[-1] == '=':
@@ -1176,8 +1176,11 @@ def parsePropsFromForm(db, cl, form, nodeid=0, num_re=re.compile('^\d+$')):
11761176

11771177
# see if all the required properties have been supplied
11781178
if required:
1179-
raise ValueError, 'Required properties %s not supplied'%(
1180-
', '.join(required))
1179+
if len(required) > 1:
1180+
p = 'properties'
1181+
else:
1182+
p = 'property'
1183+
raise ValueError, 'Required %s %s not supplied'%(p, ', '.join(required))
11811184

11821185
return props
11831186

0 commit comments

Comments
 (0)