Merge remote-tracking branch 'theboegl/master' into 2478

2026-07-28 08:05:31 +02:00 · 2016-03-20 11:30:56 +02:00
parent 302cac92ad 9b08fd3964
commit 9ea8876898
6 changed files with 55 additions and 2 deletions
@@ -110,8 +110,17 @@ class Addr(object):
    @classmethod
    def fromstring(cls, str_addr):
        """Initialize Addr from string."""
-        tup = str_addr.partition(':')
-        return cls((tup[0], tup[2]))
+        if str_addr.startswith('['):
+            # ipv6 addresses starts with [
+            endIndex = str_addr.rfind(']')
+            host = str_addr[:endIndex + 1]
+            port = ''
+            if len(str_addr) > endIndex + 2 and str_addr[endIndex + 1] == ':':
+                port = str_addr[endIndex + 2:]
+            return cls((host, port))
+        else:
+            tup = str_addr.partition(':')
+            return cls((tup[0], tup[2]))

    def __str__(self):
        if self.tup[1]: