[fix] [minor] unicode issue in uploading file

webnotes/handler.py

@@ -27,7 +27,9 @@ def get_cgi_fields():
 	for key in webnotes.form.keys():
 		# file upload must not be decoded as it is treated as a binary
 		# file and hence in any encoding (it does not matter)
-		if not getattr(webnotes.form[key], 'filename', None):
+		if key == "filedata":
+			webnotes.form_dict[key] = webnotes.form.getvalue(key)
+		else:
 			webnotes.form_dict[key] = cstr(webnotes.form.getvalue(key))
 
 @webnotes.whitelist(allow_guest=True)

webnotes/utils/__init__.py

@@ -814,7 +814,7 @@ def get_path(*path):
 def get_base_path():
 	import conf
 	import os
-	return os.path.dirname(os.path.abspath(conf.__file__))
+	return os.path.dirname(os.path.abspath(conf.__file__.decode("utf-8")))
 	
 def get_url(uri=None):
 	url = get_request_site_address()

webnotes/utils/file_manager.py

@@ -73,7 +73,7 @@ def save_file(fname, content, dt, dn):
 	file_size = check_max_file_size(content)
 	temp_fname = write_file(content, files_path)
 	fname = scrub_file_name(fname)
-	fpath = os.path.join(files_path, fname).encode("utf-8")
+	fpath = os.path.join(files_path, fname)
 
 	fname_parts = fname.split(".", -1)
 	main = ".".join(fname_parts[:-1])
@@ -95,10 +95,10 @@ def save_file(fname, content, dt, dn):
 			fname = get_new_fname_based_on_version(files_path, main, extn, versions)
 			
 			# rename
-			os.rename(temp_fname, fpath)
+			os.rename(temp_fname, fpath.encode("utf-8"))
 	else:
 		# rename new file
-		os.rename(temp_fname, fpath)
+		os.rename(temp_fname, fpath.encode("utf-8"))
 
 	f = webnotes.bean({
 		"doctype": "File Data",