diff --git a/deluge/plugins/blocklist/blocklist/core.py b/deluge/plugins/blocklist/blocklist/core.py index fa9aa429d..0908ad85d 100644 --- a/deluge/plugins/blocklist/blocklist/core.py +++ b/deluge/plugins/blocklist/blocklist/core.py @@ -37,7 +37,7 @@ import os import time from datetime import datetime, timedelta -from wsgiref.handlers import format_date_time +from email.utils import formatdate from urlparse import urljoin import shutil @@ -252,7 +252,7 @@ class Core(CorePluginBase): headers = {} if self.config["last_update"] and not self.force_download: - headers['If-Modified-Since'] = format_date_time(self.config["last_update"]) + headers['If-Modified-Since'] = formatdate(self.config["last_update"], usegmt=True) log.debug("Attempting to download blocklist %s", url) log.debug("Sending headers: %s", headers) diff --git a/win32/deluge-bbfreeze.py b/win32/deluge-bbfreeze.py index a1c73afb0..f1bec3448 100644 --- a/win32/deluge-bbfreeze.py +++ b/win32/deluge-bbfreeze.py @@ -10,7 +10,7 @@ shutil.copy(python_path + "Scripts\deluge-web-script.py", python_path + "Scripts shutil.copy(python_path + "Scripts\deluge-gtk-script.pyw", python_path + "Scripts\deluge-gtk.py") shutil.copy(python_path + "Scripts\deluge-console-script.py", python_path + "Scripts\deluge-console.py") -includes=("libtorrent", "gzip", "zipfile", "re", "socket", "struct", "cairo", "pangocairo", "atk", "pango", "wsgiref.handlers", "twisted.internet.utils", "gio", "gtk.glade") +includes=("libtorrent", "gzip", "zipfile", "re", "socket", "struct", "cairo", "pangocairo", "atk", "pango", "twisted.internet.utils", "gio", "gtk.glade") excludes=("numpy", "OpenGL", "psyco", "win32ui") dst = "..\\build-win32\\deluge-bbfreeze-" + build_version + "\\"