conf migration

setup/doctype/backup_manager/backup_googledrive.py

@@ -113,7 +113,7 @@ def backup_to_gdrive():
 
 def get_gdrive_flow():
 	from oauth2client.client import OAuth2WebServerFlow
-	import conf
+	from webnotes import conf
 	
 	if not hasattr(conf, "gdrive_client_id"):
 		webnotes.msgprint(_("Please set Google Drive access keys in") + " conf.py", 
@@ -169,4 +169,4 @@ def create_folder(name, service, folder_id):
 	return database['id']
 
 if __name__=="__main__":
-	backup_to_gdrive()
+	backup_to_gdrive()

setup/doctype/email_digest/email_digest.py

@@ -457,7 +457,7 @@ def send():
 	from webnotes.utils import getdate
 	now_date = now_datetime().date()
 	
-	import conf
+	from webnotes import conf
 	if hasattr(conf, "expires_on") and now_date > getdate(conf.expires_on):
 		# do not send email digests to expired accounts
 		return