From aabf600c38138302f46d3682db5ee99baf7171eb Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Mon, 2 May 2016 17:10:45 +0200 Subject: [PATCH] Fix incorrectly resolved merge conflicts Two file merge conflicts, __init__.py and upnp.py, were not resolved correctly by the automatic resolving (probably because the affected code was written by other people and I merged them into mailchuck fork). This changes it to the same code that is in the mailchuck fork) --- src/bitmessageqt/__init__.py | 1 + src/upnp.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 0cd07c13..cae51676 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -11,6 +11,7 @@ try: from PyQt4 import QtCore, QtGui from PyQt4.QtCore import * from PyQt4.QtGui import * + from PyQt4.QtNetwork import QLocalSocket, QLocalServer except Exception as err: logmsg = 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download it from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\' (without quotes).' diff --git a/src/upnp.py b/src/upnp.py index 040d9ac6..e6b689fc 100644 --- a/src/upnp.py +++ b/src/upnp.py @@ -71,6 +71,7 @@ class Router: import urllib2 from xml.dom.minidom import parseString from urlparse import urlparse + from debug import logger self.address = address @@ -81,7 +82,12 @@ class Router: if len(part) == 2: header[part[0].lower()] = part[1] - self.routerPath = urlparse(header['location']) + try: + self.routerPath = urlparse(header['location']) + if not self.routerPath or not hasattr(self.routerPath, "hostname"): + logger.error ("UPnP: no hostname: %s", header['location']) + except KeyError: + logger.error ("UPnP: missing location header") # get the profile xml file and read it into a variable directory = urllib2.urlopen(header['location']).read()