Python 3 fixes [merge asap] (#12884)
* Python 3 fixes
* fixed compare
diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index 9eee6cc..5470446 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -7,6 +7,8 @@
from frappe.utils import cstr, flt
import json, copy
+from six import string_types
+
class ItemVariantExistsError(frappe.ValidationError): pass
class InvalidItemAttributeValueError(frappe.ValidationError): pass
class ItemTemplateCannotHaveStock(frappe.ValidationError): pass
@@ -26,7 +28,7 @@
return make_variant_based_on_manufacturer(item_template, manufacturer,
manufacturer_part_no)
else:
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
if not args:
@@ -150,7 +152,7 @@
@frappe.whitelist()
def create_variant(item, args):
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
template = frappe.get_doc("Item", item)
@@ -177,7 +179,7 @@
item=item, args=args, now=frappe.flags.in_test);
def create_multiple_variants(item, args):
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
args_set = generate_keyed_value_combinations(args)