Merge branch 'hotfix'

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.0.4'
+__version__ = '10.0.5'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/data_import/importer.py

@@ -200,13 +200,10 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
 
 	def validate_naming(doc):
 		autoname = frappe.get_meta(doctype).autoname
-
 		if autoname:
-			if ".#" in autoname or "hash" in autoname:
-				autoname = ""
-			elif autoname[0:5] == 'field':
+			if autoname[0:5] == 'field':
 				autoname = autoname[6:]
-			elif autoname=='naming_series:':
+			elif autoname == 'naming_series:':
 				autoname = 'naming_series'
 			else:
 				return True

frappe/core/doctype/data_import/test_data_import.py

@@ -3,7 +3,99 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import unittest
+import frappe, unittest
+from frappe.core.doctype.data_import import exporter
+from frappe.core.doctype.data_import import importer
+from frappe.utils.csvutils import read_csv_content
 
 class TestDataImport(unittest.TestCase):
-	pass
+	def test_export(self):
+		exporter.get_template("User", all_doctypes="No", with_data="No")
+		content = read_csv_content(frappe.response.result)
+		self.assertTrue(content[1][1], "User")
+
+	def test_export_with_data(self):
+		exporter.get_template("User", all_doctypes="No", with_data="Yes")
+		content = read_csv_content(frappe.response.result)
+		self.assertTrue(content[1][1], "User")
+		self.assertTrue("Administrator" in [c[1] for c in content if len(c)>1])
+
+	def test_export_with_all_doctypes(self):
+		exporter.get_template("User", all_doctypes="Yes", with_data="Yes")
+		content = read_csv_content(frappe.response.result)
+		self.assertTrue(content[1][1], "User")
+		self.assertTrue('"Administrator"' in [c[1] for c in content if len(c)>1])
+		self.assertEquals(content[13][0], "DocType:")
+		self.assertEquals(content[13][1], "User")
+		self.assertTrue("Has Role" in content[13])
+
+	def test_import(self):
+		if frappe.db.exists("Blog Category", "test-category"):
+			frappe.delete_doc("Blog Category", "test-category")
+
+		exporter.get_template("Blog Category", all_doctypes="No", with_data="No")
+		content = read_csv_content(frappe.response.result)
+		content.append(["", "", "test-category", "Test Cateogry"])
+		importer.upload(content)
+		self.assertTrue(frappe.db.get_value("Blog Category", "test-category", "title"), "Test Category")
+
+		# export with data
+		exporter.get_template("Blog Category", all_doctypes="No", with_data="Yes")
+		content = read_csv_content(frappe.response.result)
+
+		# overwrite
+		content[-1][3] = "New Title"
+		importer.upload(content, overwrite=True)
+		self.assertTrue(frappe.db.get_value("Blog Category", "test-category", "title"), "New Title")
+
+	def test_import_only_children(self):
+		user_email = "test_import_userrole@example.com"
+		if frappe.db.exists("User", user_email):
+			frappe.delete_doc("User", user_email)
+
+		frappe.get_doc({"doctype": "User", "email": user_email, "first_name": "Test Import UserRole"}).insert()
+
+		exporter.get_template("Has Role", "User", all_doctypes="No", with_data="No")
+		content = read_csv_content(frappe.response.result)
+		content.append(["", "test_import_userrole@example.com", "Blogger"])
+		importer.upload(content)
+
+		user = frappe.get_doc("User", user_email)
+		self.assertTrue(frappe.db.get_value("Has Role", filters={"role": "Blogger", "parent": user_email, "parenttype": "User"}))
+		self.assertTrue(user.get("roles")[0].role, "Blogger")
+
+		# overwrite
+		exporter.get_template("Has Role", "User", all_doctypes="No", with_data="No")
+		content = read_csv_content(frappe.response.result)
+		content.append(["", "test_import_userrole@example.com", "Website Manager"])
+		importer.upload(content, overwrite=True)
+
+		user = frappe.get_doc("User", user_email)
+		self.assertEquals(len(user.get("roles")), 1)
+		self.assertTrue(user.get("roles")[0].role, "Website Manager")
+
+	def test_import_with_children(self):	#pylint: disable=R0201
+		if frappe.db.exists("Event", "EV00001"):
+			frappe.delete_doc("Event", "EV00001")
+		exporter.get_template("Event", all_doctypes="Yes", with_data="No")
+		content = read_csv_content(frappe.response.result)
+
+		content.append([None] * len(content[-2]))
+		content[-1][1] = "EV00001"
+		content[-1][2] = "__Test Event with children"
+		content[-1][3] = "Private"
+		content[-1][4] = "2014-01-01 10:00:00.000000"
+		importer.upload(content)
+
+		frappe.get_doc("Event", {"subject":"__Test Event with children"})
+
+	def test_excel_import(self):
+		if frappe.db.exists("Event", "EV00001"):
+			frappe.delete_doc("Event", "EV00001")
+
+		exporter.get_template("Event", all_doctypes="No", with_data="No", from_data_import="Yes", excel_format="Yes")
+		from frappe.utils.xlsxutils import read_xlsx_file_from_attached_file
+		content = read_xlsx_file_from_attached_file(fcontent=frappe.response.filecontent)
+		content.append(["", "EV00001", "_test", "Private", "05-11-2017 13:51:48", "0", "0", "", "1", "blue"])
+		importer.upload(content)
+		self.assertTrue(frappe.db.get_value("Event", "EV00001", "subject"), "_test")

frappe/tests/test_data_import.py

@@ -1,98 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-from __future__ import unicode_literals
-
-import frappe, unittest
-from frappe.core.doctype.data_import import exporter
-from frappe.core.doctype.data_import import importer
-from frappe.utils.csvutils import read_csv_content
-
-class TestDataImport(unittest.TestCase):
-	def test_export(self):
-		exporter.get_template("User", all_doctypes="No", with_data="No")
-		content = read_csv_content(frappe.response.result)
-		self.assertTrue(content[1][1], "User")
-
-	def test_export_with_data(self):
-		exporter.get_template("User", all_doctypes="No", with_data="Yes")
-		content = read_csv_content(frappe.response.result)
-		self.assertTrue(content[1][1], "User")
-		self.assertTrue("Administrator" in [c[1] for c in content if len(c)>1])
-
-	def test_export_with_all_doctypes(self):
-		exporter.get_template("User", all_doctypes="Yes", with_data="Yes")
-		content = read_csv_content(frappe.response.result)
-		self.assertTrue(content[1][1], "User")
-		self.assertTrue('"Administrator"' in [c[1] for c in content if len(c)>1])
-		self.assertEquals(content[13][0], "DocType:")
-		self.assertEquals(content[13][1], "User")
-		self.assertTrue("Has Role" in content[13])
-
-	def test_import(self):
-		if frappe.db.exists("Blog Category", "test-category"):
-			frappe.delete_doc("Blog Category", "test-category")
-
-		exporter.get_template("Blog Category", all_doctypes="No", with_data="No")
-		content = read_csv_content(frappe.response.result)
-		content.append(["", "", "test-category", "Test Cateogry"])
-		importer.upload(content)
-		self.assertTrue(frappe.db.get_value("Blog Category", "test-category", "title"), "Test Category")
-
-		# export with data
-		exporter.get_template("Blog Category", all_doctypes="No", with_data="Yes")
-		content = read_csv_content(frappe.response.result)
-
-		# overwrite
-		content[-1][3] = "New Title"
-		importer.upload(content, overwrite=True)
-		self.assertTrue(frappe.db.get_value("Blog Category", "test-category", "title"), "New Title")
-
-	def test_import_only_children(self):
-		user_email = "test_import_userrole@example.com"
-		if frappe.db.exists("User", user_email):
-			frappe.delete_doc("User", user_email)
-		
-		frappe.get_doc({"doctype": "User", "email": user_email, 
-			"first_name": "Test Import UserRole"}).insert()
-
-		exporter.get_template("Has Role", "User", all_doctypes="No", with_data="No")
-		content = read_csv_content(frappe.response.result)
-		content.append(["", "test_import_userrole@example.com", "Blogger"])
-		importer.upload(content)
-
-		user = frappe.get_doc("User", user_email)
-		self.assertTrue(frappe.db.get_value("Has Role", filters={"role": "Blogger", "parent": user_email, "parenttype": "User"}))
-		self.assertTrue(user.get("roles")[0].role, "Blogger")
-
-		# overwrite
-		exporter.get_template("Has Role", "User", all_doctypes="No", with_data="No")
-		content = read_csv_content(frappe.response.result)
-		content.append(["", "test_import_userrole@example.com", "Website Manager"])
-		importer.upload(content, overwrite=True)
-
-		user = frappe.get_doc("User", user_email)
-		self.assertEquals(len(user.get("roles")), 1)
-		self.assertTrue(user.get("roles")[0].role, "Website Manager")
-
-	def test_import_with_children(self):
-		exporter.get_template("Event", all_doctypes="Yes", with_data="No")
-		content = read_csv_content(frappe.response.result)
-
-		content.append([None] * len(content[-2]))
-		content[-1][2] = "__Test Event with children"
-		content[-1][3] = "Private"
-		content[-1][4] = "2014-01-01 10:00:00.000000"
-		importer.upload(content)
-
-		ev = frappe.get_doc("Event", {"subject":"__Test Event with children"})
-
-	def test_excel_import(self):
-		if frappe.db.exists("Event", "EV00001"):
-			frappe.delete_doc("Event", "EV00001")
-
-		exporter.get_template("Event", all_doctypes="No", with_data="No", from_data_import="Yes", excel_format="Yes")
-		from frappe.utils.xlsxutils import read_xlsx_file_from_attached_file
-		content = read_xlsx_file_from_attached_file(fcontent=frappe.response.filecontent)
-		content.append(["", "EV00001", "_test", "Private", "05-11-2017 13:51:48", "0", "0", "", "1", "blue"])
-		importer.upload(content)
-		self.assertTrue(frappe.db.get_value("Event", "EV00001", "subject"), "_test")