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__ = '9.2.13'
+__version__ = '9.2.14'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/integrations/doctype/dropbox_settings/dropbox_settings.py

@@ -122,26 +122,27 @@ def upload_from_folder(path, dropbox_folder, dropbox_client, did_not_upload, err
 		else:
 			raise
 
-	for filename in os.listdir(path):
-		filename = cstr(filename)
-
-		if filename in ignore_list:
-			continue
-
-		found = False
-		filepath = os.path.join(path, filename)
-		for file_metadata in response.entries:
-			if (os.path.basename(filepath) == file_metadata.name
-				and os.stat(encode(filepath)).st_size == int(file_metadata.size)):
-				found = True
-				break
-
-		if not found:
-			try:
-				upload_file_to_dropbox(filepath, dropbox_folder, dropbox_client)
-			except Exception:
-				did_not_upload.append(filename)
-				error_log.append(frappe.get_traceback())
+	for root, directory, files in os.walk(path):
+		for filename in files:
+			filename = cstr(filename)
+			filepath = os.path.join(root, filename)
+
+			if filename in ignore_list:
+				continue
+
+			found = False
+			for file_metadata in response.entries:
+				if (os.path.basename(filepath) == file_metadata.name
+					and os.stat(encode(filepath)).st_size == int(file_metadata.size)):
+					found = True
+					break
+
+			if not found:
+				try:
+					upload_file_to_dropbox(filepath, dropbox_folder, dropbox_client)
+				except Exception:
+					did_not_upload.append(filepath)
+					error_log.append(frappe.get_traceback())
 
 def upload_file_to_dropbox(filename, folder, dropbox_client):
 	create_folder_if_not_exists(folder, dropbox_client)

frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py

@@ -22,7 +22,7 @@ class S3BackupSettings(Document):
 			aws_secret_access_key=self.get_password('secret_access_key'),
 		)
 
-		bucket_lower = str(self.bucket).lower()
+		bucket_lower = str(self.bucket)
 
 		try:
 			conn.list_buckets()