Merge pull request #477 from erpnext/compatibility-fixes

fix: Compatibility fixes for Frappe v13, develop & Py3

foundation/erpnext_foundation/doctype/bounty/bounty.py

@@ -5,7 +5,6 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
-from frappe.website.utils import get_comment_list
 from frappe.utils import date_diff, nowdate, fmt_money, add_months
 from frappe.website.utils import get_comment_list
 

foundation/erpnext_foundation/doctype/bounty/test_bounty.py

@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestBounty(unittest.TestCase):

foundation/erpnext_foundation/doctype/conference_participant/test_conference_participant.py

@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestConferenceParticipant(unittest.TestCase):

foundation/erpnext_foundation/doctype/conference_settings/conference_settings.py

@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
 
 class ConferenceSettings(Document):

foundation/erpnext_foundation/doctype/conference_talk_proposal/test_conference_talk_proposal.py

@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestConferenceTalkProposal(unittest.TestCase):

foundation/erpnext_foundation/doctype/developer_sprint/test_developer_sprint.py

@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestDeveloperSprint(unittest.TestCase):

foundation/erpnext_foundation/doctype/esoc_applicant/esoc_applicant.py

@@ -14,8 +14,8 @@ class ESoCApplicant(Document):
 		self.validate_agreement_check()
 
 	def validate_email_type(self, email):
-		from frappe.utils import validate_email_add
-		validate_email_add(email.strip(), True)
+		from frappe.utils import validate_email_address
+		validate_email_address(email.strip(), True)
 
 	def validate_dob(self):
 		from frappe.utils import now_datetime, getdate

foundation/erpnext_foundation/doctype/esoc_project_detail/esoc_project_detail.py

@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
 
 class ESoCProjectDetail(Document):

foundation/erpnext_foundation/doctype/foundation_fellowship/test_foundation_fellowship.py

@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestFoundationFellowship(unittest.TestCase):

foundation/erpnext_foundation/doctype/foundation_project/foundation_project.py

@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
-from frappe.website.render import clear_cache as clear_website_cache
+from frappe.website.utils import clear_cache as clear_website_cache
 
 class FoundationProject(Document):
 	def validate(self):

foundation/erpnext_foundation/doctype/frappe_app/frappe_app.py

@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.website.website_generator import WebsiteGenerator
 
 class FrappeApp(WebsiteGenerator):

foundation/erpnext_foundation/doctype/frappe_app/test_frappe_app.py

@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestFrappeApp(unittest.TestCase):

foundation/erpnext_foundation/doctype/portal_event/portal_event.py

@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 
 from frappe.website.website_generator import WebsiteGenerator
 

foundation/erpnext_foundation/doctype/portal_event/test_portal_event.py

@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 # test_records = frappe.get_test_records('Portal Event')

foundation/erpnext_foundation/doctype/portal_job/test_portal_job.py

@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 # test_records = frappe.get_test_records('Portal Job')

foundation/erpnext_foundation/doctype/service_provider/service_provider.py

@@ -25,6 +25,6 @@ def get_last_login_diff(user):
 		Returns difference between todays date and last login date
 	"""
 	last_login = frappe.db.get_value("User", user, ["last_login"])
-	for x in xrange(1,10):
+	for x in range(1,10):
 		print((get_datetime() - get_datetime(last_login)).days, user)
 	return (get_datetime() - get_datetime(last_login)).days

foundation/erpnext_foundation/doctype/service_provider/test_service_provider.py

@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 # test_records = frappe.get_test_records('Service Provider')

foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/add_edit_app/add_edit_app.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/add_event/add_event.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/apply_for_esoc/apply_for_esoc.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/back_this_bounty/back_this_bounty.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/back_this_bounty_usd/back_this_bounty_usd.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/conference_talk_proposal/conference_talk_proposal.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/developer_sprint/developer_sprint.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/jobs/jobs.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/memberships/memberships.py

@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 
 import frappe
-import datetime
 from frappe.utils import fmt_money
 
 def get_context(context):

foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/request_a_call/request_a_call.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/service_provider/service_provider.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/erpnext_foundation/web_form/start_a_new_bounty/start_a_new_bounty.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import frappe
 
 def get_context(context):
 	# do your magic here

foundation/migrate.py

@@ -1,4 +1,3 @@
-import frappe
 
 def migrate():
 	pass

foundation/www/conf/2019/talks.py

@@ -1,4 +1,3 @@
-import frappe
 
 def get_context(context):
 	context.schedules = [

foundation/www/members/setup_payment.py

@@ -1,5 +1,4 @@
 import frappe
-import foundation
 
 no_cache = 1
 def get_context(context):