copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

since we demand python 2.4 remove 2.3 legacy support code

This commit is contained in:
Nikos Kouremenos 2006-09-06 13:15:32 +00:00
parent 80ba7ac5e7
commit 9bd4442784
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/helpers.py
View File

@ -463,14 +463,6 @@ def from_xs_boolean_to_python_boolean(value):
return val return val
def ensure_unicode_string(s):
# py23 u'abc'.decode('utf-8') raises
# python24 does not. if python23 is ooold we can remove this func
# FIXME: remove this when we abandon py23
if isinstance(s, str):
s = s.decode('utf-8')
return s
def get_xmpp_show(show): def get_xmpp_show(show):
if show in ('online', 'offline'): if show in ('online', 'offline'):
return None return None

9
src/gtkgui_helpers.py
View File

@ -126,8 +126,8 @@ def get_default_font():
# in try because daemon may not be there # in try because daemon may not be there
client = gconf.client_get_default() client = gconf.client_get_default()
return helpers.ensure_unicode_string( return client.get_string('/desktop/gnome/interface/font_name'
client.get_string('/desktop/gnome/interface/font_name')) ).decode('utf-8')
except: except:
pass pass
@ -147,8 +147,7 @@ def get_default_font():
for line in file(xfce_config_file): for line in file(xfce_config_file):
if line.find('name="Gtk/FontName"') != -1: if line.find('name="Gtk/FontName"') != -1:
start = line.find('value="') + 7 start = line.find('value="') + 7
return helpers.ensure_unicode_string( return line[start:line.find('"', start)].decode('utf-8')
line[start:line.find('"', start)])
except: except:
#we talk about file #we talk about file
print >> sys.stderr, _('Error: cannot open %s for reading') % xfce_config_file print >> sys.stderr, _('Error: cannot open %s for reading') % xfce_config_file
@ -163,7 +162,7 @@ def get_default_font():
font_name = values[0] font_name = values[0]
font_size = values[1] font_size = values[1]
font_string = '%s %s' % (font_name, font_size) # Verdana 9 font_string = '%s %s' % (font_name, font_size) # Verdana 9
return helpers.ensure_unicode_string(font_string) return font_string.decode('utf-8')
except: except:
#we talk about file #we talk about file
print >> sys.stderr, _('Error: cannot open %s for reading') % kde_config_file print >> sys.stderr, _('Error: cannot open %s for reading') % kde_config_file