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

Merge pull request #16599 from adityahase/python3-fix

Browse Source 
fix(py3): Use six.text_type instead of unicode
This commit is contained in:
Aditya Hase 2019-02-07 22:20:41 +05:30 committed by GitHub
commit a9f20d801d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@ -4,6 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
import json import json
from six import text_type
from frappe import _ from frappe import _
from frappe.utils import flt, get_datetime, getdate, date_diff, cint, nowdate from frappe.utils import flt, get_datetime, getdate, date_diff, cint, nowdate
from frappe.model.document import Document from frappe.model.document import Document
@ -591,10 +592,10 @@ def make_timesheet(production_order, company):
@frappe.whitelist() @frappe.whitelist()
def add_timesheet_detail(timesheet, args): def add_timesheet_detail(timesheet, args):
if isinstance(timesheet, unicode): if isinstance(timesheet, text_type):
timesheet = frappe.get_doc('Timesheet', timesheet) timesheet = frappe.get_doc('Timesheet', timesheet)
if isinstance(args, unicode): if isinstance(args, text_type):
args = json.loads(args) args = json.loads(args)
timesheet.append('time_logs', args) timesheet.append('time_logs', args)

3
erpnext/stock/doctype/batch/batch.py
View File

@ -2,6 +2,7 @@
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
from six import text_type
import frappe import frappe
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
@ -60,7 +61,7 @@ def _make_naming_series_key(prefix):
:param prefix: Naming series prefix gotten from Stock Settings :param prefix: Naming series prefix gotten from Stock Settings
:return: The derived key. If no prefix is given, an empty string is returned :return: The derived key. If no prefix is given, an empty string is returned
""" """
if not unicode(prefix): if not text_type(prefix):
return '' return ''
else: else:
return prefix.upper() + '.#####' return prefix.upper() + '.#####'

3
erpnext/templates/pages/search_help.py
View File

@ -3,6 +3,7 @@ import frappe, requests
from frappe import _ from frappe import _
from jinja2 import utils from jinja2 import utils
from html2text import html2text from html2text import html2text
from six import text_type
from frappe.utils import sanitize_html from frappe.utils import sanitize_html
from frappe.utils.global_search import search from frappe.utils.global_search import search
@ -73,7 +74,7 @@ def prepare_api_results(api, topics_data):
for topic in topics_data: for topic in topics_data:
route = api.base_url + '/' + (api.post_route + '/' if api.post_route else "") route = api.base_url + '/' + (api.post_route + '/' if api.post_route else "")
for key in api.post_route_key_list.split(','): for key in api.post_route_key_list.split(','):
route += unicode(topic[key]) route += text_type(topic[key])
results.append(frappe._dict({ results.append(frappe._dict({
'title': topic[api.post_title_key], 'title': topic[api.post_title_key],