From 55a08dee785da2ba6239d20e2a2d7a1f8634530e Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 23 Jan 2019 00:28:02 +0530 Subject: [PATCH 1/2] style: Remove unusued local variable --- erpnext/stock/stock_balance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py index 09d4e43840..045bee52d9 100644 --- a/erpnext/stock/stock_balance.py +++ b/erpnext/stock/stock_balance.py @@ -257,7 +257,7 @@ def repost_all_stock_vouchers(): doc.update_stock_ledger() doc.make_gl_entries(repost_future_gle=False) frappe.db.commit() - except Exception as e: + except Exception: print(frappe.get_traceback()) rejected.append([voucher_type, voucher_no]) frappe.db.rollback() From f79937d64b7ae9a61fd138440e1b33585118398f Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 23 Jan 2019 00:28:37 +0530 Subject: [PATCH 2/2] style: Remove unused imports --- erpnext/accounts/party.py | 2 +- erpnext/controllers/item_variant.py | 2 -- erpnext/controllers/selling_controller.py | 2 +- erpnext/controllers/stock_controller.py | 2 +- erpnext/hub_node/api.py | 4 ---- erpnext/shopping_cart/product_info.py | 2 +- erpnext/startup/__init__.py | 1 - erpnext/templates/utils.py | 5 ++--- erpnext/tests/test_woocommerce.py | 2 +- erpnext/www/payment_setup_certification.py | 1 - 10 files changed, 7 insertions(+), 16 deletions(-) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index a69a172284..1d1eb21eac 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -14,7 +14,7 @@ from frappe.contacts.doctype.address.address import (get_address_display, from frappe.contacts.doctype.contact.contact import get_contact_details, get_default_contact from erpnext.exceptions import PartyFrozen, PartyDisabled, InvalidAccountCurrency from erpnext.accounts.utils import get_fiscal_year -from erpnext import get_default_currency, get_company_currency +from erpnext import get_company_currency from six import iteritems diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py index 24726ad03b..646f23879a 100644 --- a/erpnext/controllers/item_variant.py +++ b/erpnext/controllers/item_variant.py @@ -260,8 +260,6 @@ def generate_keyed_value_combinations(args): return results def copy_attributes_to_variant(item, variant): - from frappe.model import no_value_fields - # copy non no-copy fields exclude_fields = ["naming_series", "item_code", "item_name", "show_in_website", diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index 684a2cdbcb..a9883017cf 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -8,7 +8,7 @@ from frappe import _, throw from erpnext.stock.get_item_details import get_bin_details from erpnext.stock.utils import get_incoming_rate from erpnext.stock.get_item_details import get_conversion_factor -from erpnext.stock.doctype.item.item import get_item_defaults, set_item_default +from erpnext.stock.doctype.item.item import set_item_default from frappe.contacts.doctype.address.address import get_address_display from erpnext.controllers.stock_controller import StockController diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 0b19b7aaf9..0a3cd3499b 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe, erpnext from frappe.utils import cint, flt, cstr -from frappe import msgprint, _ +from frappe import _ import frappe.defaults from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.general_ledger import make_gl_entries, delete_gl_entries, process_gl_map diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py index c236822490..0c94df3159 100644 --- a/erpnext/hub_node/api.py +++ b/erpnext/hub_node/api.py @@ -2,10 +2,6 @@ from __future__ import unicode_literals import frappe import json -import io -import base64 -import os -import requests from frappe import _ from frappe.frappeclient import FrappeClient diff --git a/erpnext/shopping_cart/product_info.py b/erpnext/shopping_cart/product_info.py index b5f129b4aa..3af5afa044 100644 --- a/erpnext/shopping_cart/product_info.py +++ b/erpnext/shopping_cart/product_info.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from erpnext.shopping_cart.cart import _get_cart_quotation from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings \ - import is_cart_enabled, get_shopping_cart_settings, show_quantity_in_website + import get_shopping_cart_settings, show_quantity_in_website from erpnext.utilities.product import get_price, get_qty_in_stock @frappe.whitelist(allow_guest=True) diff --git a/erpnext/startup/__init__.py b/erpnext/startup/__init__.py index b65fc0f10e..deef4ba4d6 100644 --- a/erpnext/startup/__init__.py +++ b/erpnext/startup/__init__.py @@ -19,7 +19,6 @@ # default settings that can be made for a user. from __future__ import unicode_literals -import frappe product_name = "ERPNext" user_defaults = { diff --git a/erpnext/templates/utils.py b/erpnext/templates/utils.py index eb84bcc8d8..03060201bb 100644 --- a/erpnext/templates/utils.py +++ b/erpnext/templates/utils.py @@ -3,9 +3,8 @@ from __future__ import unicode_literals -import frappe, json -from frappe import _ -from frappe.utils import cint, formatdate +import frappe + @frappe.whitelist(allow_guest=True) def send_message(subject="Website Query", message="", sender="", status="Open"): diff --git a/erpnext/tests/test_woocommerce.py b/erpnext/tests/test_woocommerce.py index 0347e953f4..a48d48cde1 100644 --- a/erpnext/tests/test_woocommerce.py +++ b/erpnext/tests/test_woocommerce.py @@ -1,4 +1,4 @@ -import unittest, frappe, requests, os, time, erpnext +import unittest, frappe, requests, os, time from erpnext.erpnext_integrations.connectors.woocommerce_connection import order class TestWoocommerce(unittest.TestCase): diff --git a/erpnext/www/payment_setup_certification.py b/erpnext/www/payment_setup_certification.py index 185c220942..c65cddb5ca 100644 --- a/erpnext/www/payment_setup_certification.py +++ b/erpnext/www/payment_setup_certification.py @@ -1,5 +1,4 @@ import frappe -import foundation no_cache = 1