[tor-commits] [bridgedb/master] Change `PortList` to `addr.PortList` in bridgedb.Bridges module.

[isis at torproject.org]

commit 879ee6bb0b7700bf9486869fdeaee937f3b5d240
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Dec 10 11:16:46 2013 +0000

    Change `PortList` to `addr.PortList` in bridgedb.Bridges module.
---
 lib/bridgedb/Bridges.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py
index 158c980..a99860b 100644
--- a/lib/bridgedb/Bridges.py
+++ b/lib/bridgedb/Bridges.py
@@ -19,6 +19,7 @@ import random
 import bridgedb.Storage
 import bridgedb.Bucket
 
+from bridgedb.parse import addr
 from bridgedb.parse import networkstatus
 
 
@@ -182,7 +183,7 @@ class Bridge:
 
         # default ip, orport should get a chance at being selected
         if isinstance(self.ip, addressClass):
-            addresses.insert(0,(self.ip, PortList(self.orport)))
+            addresses.insert(0,(self.ip, addr.PortList(self.orport)))
 
         if addresses:
             address,portlist = addresses[pos % len(addresses)]
@@ -543,7 +544,7 @@ def parseCountryBlockFile(f):
                 m = regex.match(addrspec)
                 if m:
                     address = ipaddr.IPAddress(m.group(1))
-                    portlist = PortList(m.group(2))
+                    portlist = addr.PortList(m.group(2))
                     countries = countries.split(',')
                     logging.debug("Parsed address: %s", address)
                     logging.debug("Parsed portlist: %s", portlist)