Merge remote-tracking branch 'refs/remotes/map/python-requests-chunked'

1 files changed, 3 insertions, 2 deletions

diff --git a/tools/merge_sth.py b/tools/merge_sth.py
index 94d3ef2..28ad34f 100755
--- a/tools/merge_sth.py
+++ b/tools/merge_sth.py
@@ -8,6 +8,7 @@ import sys
 import json
 import urllib2
 import time
+import requests
 from base64 import b64encode
 from mergetools import parse_args, get_nfetched, hexencode, hexdecode, \
      get_logorder, get_sth
@@ -82,8 +83,8 @@ def merge_sth(args, config, localconfig):
                                    "https://%s/" % signingnode["address"],
                                    key=own_key)
             break
-        except urllib2.URLError, err:
-            print >>sys.stderr, err
+        except requests.exceptions.HTTPError, e:
+            print >>sys.stderr, e.response
             sys.stderr.flush()
     if tree_head_signature == None:
         print >>sys.stderr, "Could not contact any signing nodes"