Change to Python3 coding style

plugins/AnnounceLocal/AnnounceLocalPlugin.py

@@ -4,7 +4,7 @@ import gevent
 
 from Plugin import PluginManager
 from Config import config
-import BroadcastServer
+from . import BroadcastServer
 
 
 @PluginManager.registerTo("SiteAnnouncer")
@@ -42,7 +42,7 @@ class LocalAnnouncer(BroadcastServer.BroadcastServer):
         if force:  # Probably new site added, clean cache
             self.known_peers = {}
 
-        for peer_id, known_peer in self.known_peers.items():
+        for peer_id, known_peer in list(self.known_peers.items()):
             if time.time() - known_peer["found"] > 20 * 60:
                 del(self.known_peers[peer_id])
                 self.log.debug("Timeout, removing from known_peers: %s" % peer_id)
@@ -78,7 +78,7 @@ class LocalAnnouncer(BroadcastServer.BroadcastServer):
 
     def actionSiteListRequest(self, sender, params):
         back = []
-        sites = self.server.sites.values()
+        sites = list(self.server.sites.values())
 
         # Split adresses to group of 100 to avoid UDP size limit
         site_groups = [sites[i:i + 100] for i in range(0, len(sites), 100)]

plugins/AnnounceLocal/Test/TestAnnounce.py

@@ -85,10 +85,10 @@ class TestAnnounce:
 
     def testPeerDiscover(self, announcer, announcer_remote, site):
         assert announcer.server.peer_id != announcer_remote.server.peer_id
-        assert len(announcer.server.sites.values()[0].peers) == 0
+        assert len(list(announcer.server.sites.values())[0].peers) == 0
         announcer.broadcast({"cmd": "discoverRequest"}, port=announcer_remote.listen_port)
         time.sleep(0.1)
-        assert len(announcer.server.sites.values()[0].peers) == 1
+        assert len(list(announcer.server.sites.values())[0].peers) == 1
 
     def testRecentPeerList(self, announcer, announcer_remote, site):
         assert len(site.peers_recent) == 0
@@ -101,13 +101,13 @@ class TestAnnounce:
         assert len(site.peers) == 1
 
         # It should update peer without siteListResponse
-        last_time_found = site.peers.values()[0].time_found
+        last_time_found = list(site.peers.values())[0].time_found
         site.peers_recent.clear()
         with Spy.Spy(announcer, "handleMessage") as responses:
             announcer.broadcast({"cmd": "discoverRequest", "params": {}}, port=announcer_remote.listen_port)
             time.sleep(0.1)
         assert [response[1]["cmd"] for response in responses] == ["discoverResponse"]
         assert len(site.peers_recent) == 1
-        assert site.peers.values()[0].time_found > last_time_found
+        assert list(site.peers.values())[0].time_found > last_time_found
 
 

plugins/AnnounceLocal/__init__.py

@@ -1 +1 @@
-import AnnounceLocalPlugin
+from . import AnnounceLocalPlugin