chore: remove all six compat code

This commit is contained in:
Ankush Menat
2021-11-04 19:48:32 +05:30
parent 56a25a0c4f
commit 8fe5feb6a4
420 changed files with 179 additions and 678 deletions

View File

@@ -1,4 +1,3 @@
from frappe import _
doctype_rule_map = {

View File

@@ -1,4 +1,3 @@
from frappe import _
doctype_list = [

View File

@@ -1,4 +1,3 @@
from frappe import _

View File

@@ -1,4 +1,3 @@
import random

View File

@@ -1,4 +1,3 @@
from frappe import _

View File

@@ -9,7 +9,6 @@ from frappe import _, throw
from frappe.model.document import Document
from frappe.utils import cint
from frappe.utils.jinja import validate_template
from six import string_types
class TermsandConditions(Document):
@@ -21,7 +20,7 @@ class TermsandConditions(Document):
@frappe.whitelist()
def get_terms_and_conditions(template_name, doc):
if isinstance(doc, string_types):
if isinstance(doc, str):
doc = json.loads(doc)
terms_and_conditions = frappe.get_doc("Terms and Conditions", template_name)

View File

@@ -8,7 +8,6 @@ from frappe.custom.doctype.custom_field.custom_field import create_custom_field
from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to
from frappe.installer import update_site_config
from frappe.utils import cint
from six import iteritems
from erpnext.accounts.doctype.cash_flow_mapper.default_cash_flow_mapper import DEFAULT_MAPPERS
from erpnext.setup.default_energy_point_rules import get_default_energy_point_rules
@@ -173,12 +172,12 @@ def add_non_standard_user_types():
user_types = get_user_types_data()
user_type_limit = {}
for user_type, data in iteritems(user_types):
for user_type, data in user_types.items():
user_type_limit.setdefault(frappe.scrub(user_type), 10)
update_site_config('user_type_doctype_limit', user_type_limit)
for user_type, data in iteritems(user_types):
for user_type, data in user_types.items():
create_custom_role(data)
create_user_type(user_type, data)
@@ -228,7 +227,7 @@ def create_user_type(user_type, data):
doc.save(ignore_permissions=True)
def create_role_permissions_for_doctype(doc, data):
for doctype, perms in iteritems(data.get('doctypes')):
for doctype, perms in data.get('doctypes').items():
args = {'document_type': doctype}
for perm in perms:
args[perm] = 1

View File

@@ -1,4 +1,3 @@
import json
import frappe

View File

@@ -1,4 +1,3 @@
from frappe import _

View File

@@ -1,4 +1,3 @@
import json
import os