dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2025 from leonelcamara/patch-20

Browse Source 
Python 3 compatibility
This commit is contained in:
mdipierro
2018-09-27 22:19:20 -07:00
committed by GitHub
parent 41162c794e 19c41b308d
commit 6f87a20e26
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/languages.py
+5 -5
View File
@@ -311,7 +311,7 @@ def write_plural_dict(filename, contents):
try: try:
fp = LockedFile(filename, 'w') fp = LockedFile(filename, 'w')
fp.write('#!/usr/bin/env python\n# -*- coding: utf-8 -*-\n{\n# "singular form (0)": ["first plural form (1)", "second plural form (2)", ...],\n') fp.write('#!/usr/bin/env python\n# -*- coding: utf-8 -*-\n{\n# "singular form (0)": ["first plural form (1)", "second plural form (2)", ...],\n')
for key in sorted(contents, sort_function): for key in sorted(contents, key=sort_function):
forms = '[' + ','.join([repr(Utf8(form)) forms = '[' + ','.join([repr(Utf8(form))
for form in contents[key]]) + ']' for form in contents[key]]) + ']'
fp.write('%s: %s,\n' % (repr(Utf8(key)), forms)) fp.write('%s: %s,\n' % (repr(Utf8(key)), forms))
@@ -325,8 +325,8 @@ def write_plural_dict(filename, contents):
fp.close() fp.close()
def sort_function(x, y): def sort_function(x):
return cmp(unicode(x, 'utf-8').lower(), unicode(y, 'utf-8').lower()) return unicode(x, 'utf-8').lower()
def write_dict(filename, contents): def write_dict(filename, contents):
@@ -936,8 +936,8 @@ class translator(object):
word = w[1:] word = w[1:]
fun = cap_fun fun = cap_fun
if i is not None: if i is not None:
return fun(self.plural(word, symbols[int(i)])) return to_native(fun(self.plural(word, symbols[int(i)])))
return fun(word) return to_native(fun(word))
def sub_dict(m): def sub_dict(m):
""" word(key or num) """ word(key or num)