fix a few things for gtk3

src/common/connection_handlers.py

@@ -42,7 +42,7 @@ from calendar import timegm
 import nbxmpp
 from common import caps_cache as capscache
 
-from pep import LOCATION_DATA
+from common.pep import LOCATION_DATA
 from common import helpers
 from common import gajim
 from common import exceptions

src/common/i18n.py

@@ -28,7 +28,7 @@ from common import defs
 import unicodedata
 
 # May be changed after GTK is imported
-direction_mark = u'\u200F'
+direction_mark = '\u200F'
 
 def paragraph_direction_mark(text):
     """

src/common/proxy65_manager.py

@@ -166,7 +166,7 @@ class ProxyResolver:
         self.state = S_FINISHED
 
     def _on_connect_failure(self):
-        print 'connection failed: ' + self.host
+        print('connection failed: ' + self.host)
         self.state = S_FINISHED
         self.host = None
         self.port = 0

src/gajim.py

@@ -210,7 +210,7 @@ if os.name == 'nt':
     warnings.filterwarnings(action='ignore')
 
 if Gtk.Widget.get_default_direction() == Gtk.TextDirection.LTR:
-    i18n.direction_mark = u'\u200E'
+    i18n.direction_mark = '\u200E'
 pritext = ''
 
 from common import exceptions

src/groupchat_control.py

@@ -2808,8 +2808,8 @@ class GroupchatControl(ChatControlBase):
         if fjid in connection.blocked_contacts:
             return
         max_order = connection.get_max_blocked_list_order()
-        new_rule = {'order': str(max_order + 1), 'type': u'jid',
-            'action': u'deny', 'value' : fjid, 'child': ['message', 'iq',
+        new_rule = {'order': str(max_order + 1), 'type': 'jid',
+            'action': 'deny', 'value' : fjid, 'child': ['message', 'iq',
             'presence-out']}
         connection.blocked_list.append(new_rule)
         connection.blocked_contacts.append(fjid)