← Back to branch summary

~cmiller/ubuntu/quantal/deluge/fix-parameter-move-storage

« back to all changes in this revision

Viewing changes to deluge/ui/web/auth.py

  • Committer: Bazaar Package Importer
  • Author(s): Cristian Greco
  • Date: 2009-12-24 00:57:59 UTC
  • mfrom: (4.1.9 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091224005759-ifkuzevkdqqx4jle
Tags: 1.2.0~rc5-1
http://bugs.debian.org/560384
* New upstream version.
  - fix startup with fresh configs. (Closes: #560384)
* debian/control: drop useless dependencies on dbus for deluge-gtk.
* fix_manifest_in.patch: dropped, file MANIFEST.in has been deleted by
  upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
deluge/ui/web/auth.py
51
51
import random
52
52
import hashlib
53
53
import logging
 
54
from datetime import datetime, timedelta
 
55
from email.utils import formatdate
54
56
 
55
57
from twisted.internet.defer import Deferred
56
58
from twisted.internet.task import LoopingCall
82
84
        return None
83
85
 
84
86
def make_expires(timeout):
85
 
    expires = int(time.time()) + timeout
86
 
    expires_str = time.strftime('%a, %d %b %Y %H:%M:%S GMT',
87
 
            time.gmtime(expires))
 
87
    dt = timedelta(seconds=timeout)
 
88
    expires = time.mktime((datetime.now() + dt).timetuple())
 
89
    expires_str = formatdate(timeval=expires, localtime=False, usegmt=True)
88
90
    return expires, expires_str
89
91
 
90
92
class Auth(JSONComponent):