From cb2a07bff2e6df60171274de93d0760f0d8f8e58 Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Thu, 21 Mar 2019 12:59:32 -0700
Subject: [PATCH] account for surt fix in urlcanon 0.3.0

---
 setup.py               | 2 +-
 tests/test_warcprox.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index f9916ae..d3e73cd 100755
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ import setuptools
 deps = [
     'certauth==1.1.6',
     'warctools>=4.10.0',
-    'urlcanon>=0.1.dev16',
+    'urlcanon>=0.3.0',
     'doublethink>=0.2.0.dev87',
     'urllib3>=1.14',
     'requests>=2.0.1',
diff --git a/tests/test_warcprox.py b/tests/test_warcprox.py
index 7c6d21a..3c38d4e 100755
--- a/tests/test_warcprox.py
+++ b/tests/test_warcprox.py
@@ -965,12 +965,12 @@ def test_block_rules(http_daemon, https_daemon, warcprox_, archiving_proxies):
         },
         {
             "url_match": "SURT_MATCH",
-            "value": "http://(localhost:%s,)/fuh/" % (http_daemon.server_port),
+            "value": "http://(localhost,:%s)/fuh/" % (http_daemon.server_port),
         },
         {
             "url_match": "SURT_MATCH",
             # this rule won't match because of http scheme, https port
-            "value": "http://(localhost:%s,)/fuh/" % (https_daemon.server_port),
+            "value": "http://(localhost,:%s)/fuh/" % (https_daemon.server_port),
         },
         {
             "domain": "bad.domain.com",