Переглянути джерело

Use 'key' keyword argument with list.sort

version-14
Aditya Hase 7 роки тому
джерело
коміт
943f548c1e
4 змінених файлів з 4 додано та 4 видалено
  1. +1
    -1
      frappe/core/doctype/language/language.py
  2. +1
    -1
      frappe/core/page/data_import_tool/exporter.py
  3. +1
    -1
      frappe/desk/doctype/desktop_icon/desktop_icon.py
  4. +1
    -1
      frappe/translate.py

+ 1
- 1
frappe/core/doctype/language/language.py Переглянути файл

@@ -14,7 +14,7 @@ def export_languages_json():
languages = frappe.db.get_all('Language', fields=['name', 'language_name']) languages = frappe.db.get_all('Language', fields=['name', 'language_name'])
languages = [{'name': d.language_name, 'code': d.name} for d in languages] languages = [{'name': d.language_name, 'code': d.name} for d in languages]


languages.sort(lambda a,b: 1 if a['code'] > b['code'] else -1)
languages.sort(key = lambda a: a['code'])


with open(frappe.get_app_path('frappe', 'geo', 'languages.json'), 'w') as f: with open(frappe.get_app_path('frappe', 'geo', 'languages.json'), 'w') as f:
f.write(frappe.as_json(languages)) f.write(frappe.as_json(languages))


+ 1
- 1
frappe/core/page/data_import_tool/exporter.py Переглянути файл

@@ -81,7 +81,7 @@ def get_template(doctype=None, parent_doctype=None, all_doctypes="No", with_data
if field and ((select_columns and f[0] in select_columns[dt]) or not select_columns): if field and ((select_columns and f[0] in select_columns[dt]) or not select_columns):
tablecolumns.append(field) tablecolumns.append(field)


tablecolumns.sort(lambda a, b: int(a.idx - b.idx))
tablecolumns.sort(key = lambda a: int(a.idx))


_column_start_end = frappe._dict(start=0) _column_start_end = frappe._dict(start=0)




+ 1
- 1
frappe/desk/doctype/desktop_icon/desktop_icon.py Переглянути файл

@@ -95,7 +95,7 @@ def get_desktop_icons(user=None):
icon.hidden = 1 icon.hidden = 1


# sort by idx # sort by idx
user_icons.sort(lambda a, b: 1 if a.idx > b.idx else -1)
user_icons.sort(key = lambda a: a.idx)


# translate # translate
for d in user_icons: for d in user_icons:


+ 1
- 1
frappe/translate.py Переглянути файл

@@ -555,7 +555,7 @@ def write_csv_file(path, app_messages, lang_dict):
:param app_messages: Translatable strings for this app. :param app_messages: Translatable strings for this app.
:param lang_dict: Full translated dict. :param lang_dict: Full translated dict.
""" """
app_messages.sort(lambda x,y: cmp(x[1], y[1]))
app_messages.sort(key = lambda x: x[1])
from csv import writer from csv import writer
with open(path, 'wb') as msgfile: with open(path, 'wb') as msgfile:
w = writer(msgfile, lineterminator='\n') w = writer(msgfile, lineterminator='\n')


Завантаження…
Відмінити
Зберегти