Commits

Anonymous committed 7934f43 Merge

merge tip

Comments (0)

Files changed (2)

beaker/docs/conf.py

 # built documents.
 #
 # The short X.Y version.
-version = '1.5.3'
+version = '1.5.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.5.3'
+release = '1.5.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

beaker/session.py

                 if self.cookie_expires is False:
                     expires = datetime.fromtimestamp( 0x7FFFFFFF )
                 elif isinstance(self.cookie_expires, timedelta):
-                    expires = datetime.today() + self.cookie_expires
+                    expires = datetime.utcnow() + self.cookie_expires
                 elif isinstance(self.cookie_expires, datetime):
                     expires = self.cookie_expires
                 else:
         if self.secure:
             self.cookie[self.key]['secure'] = True
         self.cookie[self.key]['path'] = '/'
-        expires = datetime.today().replace(year=2003)
+        expires = datetime.utcnow().replace(year=2003)
         self.cookie[self.key]['expires'] = \
             expires.strftime("%a, %d-%b-%Y %H:%M:%S GMT" )
         self.request['cookie_out'] = self.cookie[self.key].output(header='')
             if self.cookie_expires is False:
                 expires = datetime.fromtimestamp( 0x7FFFFFFF )
             elif isinstance(self.cookie_expires, timedelta):
-                expires = datetime.today() + self.cookie_expires
+                expires = datetime.utcnow() + self.cookie_expires
             elif isinstance(self.cookie_expires, datetime):
                 expires = self.cookie_expires
             else: