diff --git a/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py b/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py index e73e7d7ef..4d793ed15 100644 --- a/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py +++ b/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py @@ -38,7 +38,7 @@ import os import time import logging from datetime import datetime, timedelta -from wsgiref.handlers import format_date_time +from email.utils import formatdate from urlparse import urljoin import shutil @@ -323,7 +323,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 8a5040357..d0f1a26a8 100644 --- a/win32/deluge-bbfreeze.py +++ b/win32/deluge-bbfreeze.py @@ -10,7 +10,7 @@ shutil.copy(python_path + "Scripts\deluge-console-script.py", python_path + "Scr from bbfreeze import Freezer -f = Freezer("..\\build-win32\\deluge-bbfreeze-" + build_version, includes=("libtorrent", "gzip", "zipfile", "re", "socket", "struct", "cairo", "pangocairo", "atk", "pango", "wsgiref.handlers", "twisted.internet.utils", "gio", "gtk.glade")) +f = Freezer("..\\build-win32\\deluge-bbfreeze-" + build_version, includes=("libtorrent", "gzip", "zipfile", "re", "socket", "struct", "cairo", "pangocairo", "atk", "pango", "twisted.internet.utils", "gio", "gtk.glade")) f.addScript(python_path + "Scripts\deluge.py", gui_only=False) f.addScript(python_path + "Scripts\deluged.py", gui_only=False) f.addScript(python_path + "Scripts\deluge-web.py", gui_only=False)