regr: urllib

diff --git a/deefuzzer/station.py b/deefuzzer/station.py
index ff020eb930fe8ee553d07d538f6ca3ef81d09b37..33653a0d5d286d5a250a5cda7a483e5ae71663ad 100644 (file)
--- a/deefuzzer/station.py
+++ b/deefuzzer/station.py
@@ -43,7 +43,7 @@ import datetime
 import string
 import random
 import shout
-import urllib2
+import urllib
 import mimetypes
 from threading import Thread
 from tools import *
@@ -552,7 +552,7 @@ class Station(Thread):
         while not self.server_ping:
             try:
                 self.q.get(1)
-                server = urllib2.urlopen(self.server_url)
+                server = urllib.urlopen(self.server_url)
                 self.server_ping = True
                 self.logger.write_info('Station ' + self.channel_url + \
                                         ' : channel available')

diff --git a/deefuzzer/tools/player.py b/deefuzzer/tools/player.py
index 13310b5f6ba10d2b3551ed8757d3962b52c13751..421b7e28108faaa0c95eb918fdb8d319ea424661 100644 (file)
--- a/deefuzzer/tools/player.py
+++ b/deefuzzer/tools/player.py
@@ -112,8 +112,7 @@ class FileReader:
 
 class URLReader:
     def __init__(self, relay):
-        import urllib2
-        self.relay = urllib2.urlopen(relay)
+        self.relay = urllib.urlopen(relay)
         self.rec_mode = 0
 
     def set_recorder(self, recorder, mode=1):
@@ -126,7 +125,7 @@ class URLReader:
         except:
             while True:
                 try:
-                    self.relay = urllib2.urlopen(relay)
+                    self.relay = urllib.urlopen(relay)
                     chunk = self.relay.read(size)
                     break
                 except: