Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: remove py2 compat code

Browse Source
This commit is contained in:
Ankush Menat 2021-05-22 23:43:28 +05:30
parent c229ac9322
commit 44c489223b
No known key found for this signature in database
GPG Key ID: 8EA82E09BBD13AAF
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/item/item.py
View File

@ -1,8 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import itertools import itertools
import json import json
import erpnext import erpnext

9
erpnext/stock/doctype/item/test_item.py
View File

@ -14,7 +14,6 @@ from erpnext.stock.doctype.item.item import get_uom_conv_factor
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
from erpnext.stock.get_item_details import get_item_details from erpnext.stock.get_item_details import get_item_details
from six import iteritems
test_ignore = ["BOM"] test_ignore = ["BOM"]
test_dependencies = ["Warehouse", "Item Group", "Item Tax Template", "Brand"] test_dependencies = ["Warehouse", "Item Group", "Item Tax Template", "Brand"]
@ -98,7 +97,7 @@ class TestItem(unittest.TestCase):
"ignore_pricing_rule": 1 "ignore_pricing_rule": 1
}) })
for key, value in iteritems(to_check): for key, value in to_check.items():
self.assertEqual(value, details.get(key)) self.assertEqual(value, details.get(key))
def test_item_tax_template(self): def test_item_tax_template(self):
@ -194,7 +193,7 @@ class TestItem(unittest.TestCase):
"plc_conversion_rate": 1, "plc_conversion_rate": 1,
"customer": "_Test Customer", "customer": "_Test Customer",
}) })
for key, value in iteritems(sales_item_check): for key, value in sales_item_check.items():
self.assertEqual(value, sales_item_details.get(key)) self.assertEqual(value, sales_item_details.get(key))
purchase_item_check = { purchase_item_check = {
@ -215,7 +214,7 @@ class TestItem(unittest.TestCase):
"plc_conversion_rate": 1, "plc_conversion_rate": 1,
"supplier": "_Test Supplier", "supplier": "_Test Supplier",
}) })
for key, value in iteritems(purchase_item_check): for key, value in purchase_item_check.items():
self.assertEqual(value, purchase_item_details.get(key)) self.assertEqual(value, purchase_item_details.get(key))
def test_item_attribute_change_after_variant(self): def test_item_attribute_change_after_variant(self):
@ -464,7 +463,7 @@ class TestItem(unittest.TestCase):
self.assertEqual(len(matching_barcodes), 1) self.assertEqual(len(matching_barcodes), 1)
details = matching_barcodes[0] details = matching_barcodes[0]
for key, value in iteritems(barcode_properties): for key, value in barcode_properties.items():
self.assertEqual(value, details.get(key)) self.assertEqual(value, details.get(key))
# Add barcode again - should cause DuplicateEntryError # Add barcode again - should cause DuplicateEntryError