changeset dd54d6b1df5d in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=dd54d6b1df5d
description: python uses unicode internally
diffstat:
src/adhoc_commands.py | 4 +-
src/advanced_configuration_window.py | 32 +++---
src/atom_window.py | 6 +-
src/chat_control.py | 4 +-
src/common/atom.py | 6 +-
src/common/check_paths.py | 32 +++---
src/common/commands.py | 18 +-
src/common/configpaths.py | 60 ++++++------
src/common/connection_handlers.py | 2 +-
src/common/dataforms.py | 8 +-
src/common/helpers.py | 21 +--
src/common/i18n.py | 8 +-
src/common/kwalletbinding.py | 2 +-
src/common/logger.py | 5 +-
src/common/optparser.py | 4 +-
src/common/rst_xhtml_generator.py | 4 +-
src/config.py | 133 ++++++++++++--------------
src/dataforms_widget.py | 6 +-
src/dialogs.py | 91 ++++++++---------
src/disco.py | 52 +++++-----
src/features_window.py | 2 +-
src/filetransfers_window.py | 20 ++--
src/gajim_themes_window.py | 5 +-
src/groupchat_control.py | 32 +++---
src/gtkgui_helpers.py | 6 +-
src/gui_interface.py | 6 +-
src/history_manager.py | 14 +-
src/history_window.py | 4 +-
src/htmltextview.py | 4 +-
src/plugins/gui.py | 2 +-
src/plugins/plugin.py | 10 +-
src/profile_window.py | 4 +-
src/roster_window.py | 175 +++++++++++++++++-----------------
src/statusicon.py | 2 +-
test/integration/test_roster.py | 4 +-
test/lib/data.py | 90 +++++++++---------
test/unit/test_jingle.py | 78 +++++++-------
test/unit/test_xmpp_transports_nb.py | 30 +++---
38 files changed, 482 insertions(+), 504 deletions(-)
diffs (truncated from 3141 to 300 lines):
diff -r 0086c1032eaa -r dd54d6b1df5d src/adhoc_commands.py
--- a/src/adhoc_commands.py Tue Jan 01 19:36:56 2013 +0100
+++ b/src/adhoc_commands.py Tue Jan 01 19:44:25 2013 +0100
@@ -452,7 +452,7 @@
note = command.getTag('note')
if note:
- self.notes_label.set_text(note.getData().decode('utf-8'))
+ self.notes_label.set_text(note.getData())
self.notes_label.set_no_show_all(False)
self.notes_label.show()
else:
@@ -510,7 +510,7 @@
try:
errorname = nbxmpp.NS_STANZAS + ' ' + str(errorid)
errordesc = nbxmpp.ERRORS[errorname][2]
- error = errordesc.decode('utf-8')
+ error = errordesc
del errorname, errordesc
except KeyError: # when stanza doesn't have error
description
error = _('Service returned an error.')
diff -r 0086c1032eaa -r dd54d6b1df5d src/advanced_configuration_window.py
--- a/src/advanced_configuration_window.py Tue Jan 01 19:36:56 2013 +0100
+++ b/src/advanced_configuration_window.py Tue Jan 01 19:44:25 2013 +0100
@@ -141,8 +141,7 @@
"""
optname = model[iter_][C_PREFNAME]
opttype = model[iter_][C_TYPE]
-
- if opttype.decode('utf-8') == self.types['boolean'] or optname ==
'password':
+ if opttype == self.types['boolean'] or optname == 'password':
cell.set_property('editable', False)
else:
cell.set_property('editable', True)
@@ -153,10 +152,10 @@
# path[1] is the key name
# path[2] is the root of tree
# last two is optional
- path = [model[iter_][0].decode('utf-8')]
+ path = [model[iter_][0]]
parent = model.iter_parent(iter_)
while parent:
- path.append(model[parent][0].decode('utf-8'))
+ path.append(model[parent][0])
parent = model.iter_parent(parent)
return path
@@ -194,17 +193,17 @@
def on_advanced_treeview_row_activated(self, treeview, path, column):
modelpath = self.modelfilter.convert_path_to_child_path(path)
modelrow = self.model[modelpath]
- option = modelrow[0].decode('utf-8')
- if modelrow[2].decode('utf-8') == self.types['boolean']:
+ option = modelrow[0]
+ if modelrow[2] == self.types['boolean']:
for key in self.right_true_dict.keys():
- if self.right_true_dict[key] == modelrow[1].decode('utf-8'):
+ if self.right_true_dict[key] == modelrow[1]:
modelrow[1] = str(key)
newval = {'False': True, 'True': False}[modelrow[1]]
if len(modelpath.get_indices()) > 1:
optnamerow = self.model[modelpath.get_indices()[0]]
- optname = optnamerow[0].decode('utf-8')
+ optname = optnamerow[0]
keyrow = self.model[modelpath.get_indices()[:2]]
- key = keyrow[0].decode('utf-8')
+ key = keyrow[0]
self.remember_option(option + '\n' + key + '\n' + optname,
modelrow[1], newval)
gajim.config.set_per(optname, key, option, newval)
@@ -234,13 +233,12 @@
modelpath = self.modelfilter.convert_path_to_child_path(path)
modelrow = self.model[modelpath]
modelpath = modelpath.get_indices()
- option = modelrow[0].decode('utf-8')
- text = text.decode('utf-8')
+ option = modelrow[0]
if len(modelpath) > 1:
optnamerow = self.model[modelpath[0]]
- optname = optnamerow[0].decode('utf-8')
+ optname = optnamerow[0]
keyrow = self.model[modelpath[:2]]
- key = keyrow[0].decode('utf-8')
+ key = keyrow[0]
self.remember_option(option + '\n' + key + '\n' + optname,
modelrow[1],
text)
gajim.config.set_per(optname, key, option, text)
@@ -269,12 +267,12 @@
return
modelpath = self.modelfilter.convert_path_to_child_path(path)
modelrow = self.model[modelpath]
- option = modelrow[0].decode('utf-8')
+ option = modelrow[0]
if len(modelpath) > 1:
optnamerow = self.model[modelpath[0]]
- optname = optnamerow[0].decode('utf-8')
+ optname = optnamerow[0]
keyrow = self.model[modelpath[:2]]
- key = keyrow[0].decode('utf-8')
+ key = keyrow[0]
self.remember_option(option + '\n' + key + '\n' + optname,
modelrow[C_VALUE], default)
gajim.config.set_per(optname, key, option, default)
@@ -317,7 +315,7 @@
self.model.append(parent, [name, value, type_])
def visible_func(self, model, treeiter, data):
- search_string = self.entry.get_text().decode('utf-8').lower()
+ search_string = self.entry.get_text().lower()
for it in tree_model_pre_order(model, treeiter):
if model[it][C_TYPE] != '':
opt_path = self.get_option_path(model, it)
diff -r 0086c1032eaa -r dd54d6b1df5d src/atom_window.py
--- a/src/atom_window.py Tue Jan 01 19:36:56 2013 +0100
+++ b/src/atom_window.py Tue Jan 01 19:44:25 2013 +0100
@@ -84,20 +84,20 @@
# fill the fields
if newentry.feed_link is not None:
self.feed_title_label.set_markup(
- u'<span foreground="blue" underline="single">%s</span>' % \
+ '<span foreground="blue" underline="single">%s</span>' % \
GObject.markup_escape_text(newentry.feed_title))
else:
self.feed_title_label.set_markup(
GObject.markup_escape_text(newentry.feed_title))
self.feed_tagline_label.set_markup(
- u'<small>%s</small>' % \
+ '<small>%s</small>' % \
GObject.markup_escape_text(newentry.feed_tagline))
if newentry.title:
if newentry.uri is not None:
self.entry_title_label.set_markup(
- u'<span foreground="blue" underline="single">%s</span>' % \
+ '<span foreground="blue" underline="single">%s</span>' % \
GObject.markup_escape_text(newentry.title))
else:
self.entry_title_label.set_markup(
diff -r 0086c1032eaa -r dd54d6b1df5d src/chat_control.py
--- a/src/chat_control.py Tue Jan 01 19:36:56 2013 +0100
+++ b/src/chat_control.py Tue Jan 01 19:44:25 2013 +0100
@@ -620,7 +620,7 @@
message_buffer = self.msg_textview.get_buffer()
start_iter = message_buffer.get_start_iter()
end_iter = message_buffer.get_end_iter()
- message = message_buffer.get_text(start_iter, end_iter,
False).decode('utf-8')
+ message = message_buffer.get_text(start_iter, end_iter, False)
xhtml = self.msg_textview.get_xhtml()
# send the message
@@ -2842,7 +2842,7 @@
type_ = model[iter_][2]
if type_ != 'contact': # source is not a contact
return
- dropped_jid = data.decode('utf-8')
+ dropped_jid = data
dropped_transport = gajim.get_transport_name_from_jid(dropped_jid)
c_transport = gajim.get_transport_name_from_jid(c.jid)
diff -r 0086c1032eaa -r dd54d6b1df5d src/common/atom.py
--- a/src/common/atom.py Tue Jan 01 19:36:56 2013 +0100
+++ b/src/common/atom.py Tue Jan 01 19:44:25 2013 +0100
@@ -100,13 +100,13 @@
if main_feed is not None and source_feed is not None:
- return u'%s: %s' % (main_feed, source_feed)
+ return '%s: %s' % (main_feed, source_feed)
elif main_feed is not None:
return main_feed
elif source_feed is not None:
return source_feed
else:
- return u''
+ return ''
feed_title = property(get_feed_title, None, None,
''' Title of feed. It is built from entry''s original feed title
and title of feed
@@ -173,4 +173,4 @@
updated = property(get_updated, None, None,
''' Last significant modification time. ''')
- feed_tagline = u''
+ feed_tagline = ''
diff -r 0086c1032eaa -r dd54d6b1df5d src/common/check_paths.py
--- a/src/common/check_paths.py Tue Jan 01 19:36:56 2013 +0100
+++ b/src/common/check_paths.py Tue Jan 01 19:44:25 2013 +0100
@@ -133,11 +133,11 @@
try:
import configpaths
OLD_LOG_DB_FOLDER = os.path.join(configpaths.fse(
- os.environ[u'appdata']), u'Gajim')
+ os.environ['appdata']), 'Gajim')
except KeyError:
- OLD_LOG_DB_FOLDER = u'.'
+ OLD_LOG_DB_FOLDER = '.'
else:
- OLD_LOG_DB_FOLDER = os.path.expanduser(u'~/.gajim')
+ OLD_LOG_DB_FOLDER = os.path.expanduser('~/.gajim')
tmp = logger.CACHE_DB_PATH
logger.CACHE_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, 'cache.db')
@@ -148,7 +148,7 @@
os.chdir(back)
cur = con.cursor()
cur.execute('''SELECT name FROM sqlite_master WHERE type = 'table';''')
- tables = cur.fetchall() # we get [(u'jids',), (u'unread_messages',), ...
+ tables = cur.fetchall() # we get [('jids',), ('unread_messages',), ...
tables = [t[0] for t in tables]
cur.execute("ATTACH DATABASE '%s' AS cache" % logger.CACHE_DB_PATH)
for table in ('caps_cache', 'rooms_last_message_time', 'roster_entry',
@@ -189,22 +189,22 @@
if os.name == 'nt':
try:
OLD_LOG_DB_FOLDER = os.path.join(configpaths.fse(
- os.environ[u'appdata']), u'Gajim')
+ os.environ['appdata']), 'Gajim')
except KeyError:
- OLD_LOG_DB_FOLDER = u'.'
+ OLD_LOG_DB_FOLDER = '.'
else:
- OLD_LOG_DB_FOLDER = os.path.expanduser(u'~/.gajim')
+ OLD_LOG_DB_FOLDER = os.path.expanduser('~/.gajim')
if not os.path.exists(OLD_LOG_DB_FOLDER):
return
- OLD_LOG_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, u'logs.db')
- OLD_CACHE_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, u'cache.db')
- vars['OLD_VCARD_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'vcards')
- vars['OLD_AVATAR_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'avatars')
- vars['OLD_MY_EMOTS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'emoticons')
- vars['OLD_MY_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'iconsets')
- vars['OLD_MY_MOOD_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER,
u'moods')
+ OLD_LOG_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, 'logs.db')
+ OLD_CACHE_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, 'cache.db')
+ vars['OLD_VCARD_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'vcards')
+ vars['OLD_AVATAR_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'avatars')
+ vars['OLD_MY_EMOTS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'emoticons')
+ vars['OLD_MY_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'iconsets')
+ vars['OLD_MY_MOOD_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER,
'moods')
vars['OLD_MY_ACTIVITY_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER,
- u'activities')
+ 'activities')
OLD_CONFIG_FILES = []
OLD_DATA_FILES = []
for f in os.listdir(OLD_LOG_DB_FOLDER):
@@ -345,7 +345,7 @@
print(_('%s is a directory but should be a file') % CACHE_DB_PATH)
print(_('Gajim will now exit'))
sys.exit()
-
+
if not os.path.exists(XTLS_CERTS):
create_path(XTLS_CERTS)
if not os.path.exists(LOCAL_XTLS_CERTS):
diff -r 0086c1032eaa -r dd54d6b1df5d src/common/commands.py
--- a/src/common/commands.py Tue Jan 01 19:36:56 2013 +0100
+++ b/src/common/commands.py Tue Jan 01 19:44:25 2013 +0100
@@ -104,12 +104,12 @@
var = 'presence-type',
label = 'Type of presence:',
options = [
- (u'chat', _('Free for chat')),
- (u'online', _('Online')),
- (u'away', _('Away')),
- (u'xa', _('Extended away')),
- (u'dnd', _('Do not disturb')),
- (u'offline', _('Offline -
disconnect'))],
+ ('chat', _('Free for chat')),
+ ('online', _('Online')),
+ ('away', _('Away')),
+ ('xa', _('Extended away')),
+ ('dnd', _('Do not disturb')),
+ ('offline', _('Offline -
disconnect'))],
value = 'online',
required = True),
dataforms.Field('text-multi',
@@ -146,7 +146,7 @@
try:
presencedesc = form['presence-desc'].value
except Exception: # same exceptions as in last comment
- presencedesc = u''
+ presencedesc = ''
response, cmd = self.buildResponse(request, status = 'completed')
cmd.addChild('note', {}, _('The status has been changed.'))
@@ -197,7 +197,7 @@
options = []
account = self.connection.name
for gc in find_current_groupchats(account):
- options.append((u'%s' %(gc[0]), _('%(nickname)s on %(room_jid)s')
% \
+ options.append(('%s' %(gc[0]), _('%(nickname)s on %(room_jid)s') %
\
{'nickname': gc[1], 'room_jid': gc[0]}))
if not len(options):
response, cmd = self.buildResponse(request, status = 'completed')
@@ -367,7 +367,7 @@
if cmd.isVisibleFor(self.isSameJID(jid)):
q.addChild('item', {
# TODO: find the jid
- 'jid': self.getOurBareJID() + u'/' +
self.server_resource,
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
