From ee8f8281b47405c37af7a14707c1f160a75c8a7b Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Thu, 30 Aug 2018 19:22:22 +0530 Subject: [PATCH] [py3] Convert filter object to list (#15260) --- erpnext/hr/doctype/upload_attendance/upload_attendance.py | 2 +- erpnext/setup/doctype/email_digest/email_digest.py | 4 ++-- erpnext/setup/doctype/naming_series/naming_series.py | 2 +- .../doctype/stock_reconciliation/stock_reconciliation.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.py b/erpnext/hr/doctype/upload_attendance/upload_attendance.py index 78d5aee81d..e8b46987db 100644 --- a/erpnext/hr/doctype/upload_attendance/upload_attendance.py +++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.py @@ -98,7 +98,7 @@ def upload(): from frappe.modules import scrub rows = read_csv_content_from_uploaded_file() - rows = filter(lambda x: x and any(x), rows) + rows = list(filter(lambda x: x and any(x), rows)) if not rows: msg = [_("Please select a csv file")] return {"messages": msg, "error": msg} diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py index eadb9b1185..e6027c20d3 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.py +++ b/erpnext/setup/doctype/email_digest/email_digest.py @@ -45,8 +45,8 @@ class EmailDigest(Document): # send email only to enabled users valid_users = [p[0] for p in frappe.db.sql("""select name from `tabUser` where enabled=1""")] - recipients = filter(lambda r: r in valid_users, - self.recipient_list.split("\n")) + recipients = list(filter(lambda r: r in valid_users, + self.recipient_list.split("\n"))) original_user = frappe.session.user diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py index 54c5d17f64..4e08105a7d 100644 --- a/erpnext/setup/doctype/naming_series/naming_series.py +++ b/erpnext/setup/doctype/naming_series/naming_series.py @@ -49,7 +49,7 @@ class NamingSeries(Document): } def scrub_options_list(self, ol): - options = filter(lambda x: x, [cstr(n).strip() for n in ol]) + options = list(filter(lambda x: x, [cstr(n).strip() for n in ol])) return options def update_series(self, arg=None): diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 43a66a894b..58255d4fad 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -61,7 +61,7 @@ class StockReconciliation(StockController): - flt(qty, item.precision("qty")) * flt(rate, item.precision("valuation_rate"))) return True - items = filter(lambda d: _changed(d), self.items) + items = list(filter(lambda d: _changed(d), self.items)) if not items: frappe.throw(_("None of the items have any change in quantity or value."),