2to3 main

offlineimap/ui/Machine.py

@@ -14,7 +14,7 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 try:
-    from urllib import urlencode
+    from urllib.parse import urlencode
 except ImportError: # python3
     from urllib.parse import urlencode
 import sys

offlineimap/ui/UIBase.py

@@ -23,7 +23,7 @@ import sys
 import traceback
 import threading
 try:
-    from Queue import Queue
+    from queue import Queue
 except ImportError: # python3
     from queue import Queue
 from collections import deque