web/request.py
branchstable
changeset 7858 f91255a3b2c2
parent 7855 54283a5b7afc
child 7868 39a54b88906d
child 7870 1a1e04163cde
equal deleted inserted replaced
7856:51a3fb272bf3 7858:f91255a3b2c2
   538                  'argument, not anymore cookie object and name',
   538                  'argument, not anymore cookie object and name',
   539                  DeprecationWarning, stacklevel=2)
   539                  DeprecationWarning, stacklevel=2)
   540             secure = name[value]['secure']
   540             secure = name[value]['secure']
   541             name, value = value, name[value].value
   541             name, value = value, name[value].value
   542         if maxage: # don't check is None, 0 may be specified
   542         if maxage: # don't check is None, 0 may be specified
       
   543             assert expires is None, 'both max age and expires cant be specified'
   543             expires = maxage + time.time()
   544             expires = maxage + time.time()
   544             assert expires is None, 'both max age and expires cant be specified'
       
   545         elif expires:
   545         elif expires:
   546             expires = timegm((expires + GMTOFFSET).timetuple())
   546             expires = timegm((expires + GMTOFFSET).timetuple())
   547         else:
   547         else:
   548             expires = None
   548             expires = None
   549         # make sure cookie is set on the correct path
   549         # make sure cookie is set on the correct path