Merge remote-tracking branch 'upstream/wsgi' into wsgi

Conflicts:
	webnotes/handler.py

core/doctype/profile/profile.py

@@ -214,7 +214,7 @@ Thank you,<br>
 				
 		# disable the user and log him/her out
 		self.doc.enabled = 0
-		if getattr(webnotes, "login_manager", None):
+		if webnotes.local.login_manager:
 			webnotes.local.login_manager.logout(user=self.doc.name)
 		
 		# delete their password

webnotes/auth.py

@@ -26,7 +26,7 @@ class HTTPRequest:
 		
 		# override request method. All request to be of type POST, but if _type == "POST" then commit
 		if webnotes.form_dict.get("_type"):
-			webnotes.request_method = webnotes.form_dict.get("_type")
+			webnotes.local.request_method = webnotes.form_dict.get("_type")
 			del webnotes.form_dict["_type"]
 
 		# set db

webnotes/handler.py

@@ -30,7 +30,7 @@ def web_logout():
 	webnotes.repsond_as_web_page("Logged Out", """<p>You have been logged out.</p>
 		<p><a href='index'>Back to Home</a></p>""")
 	webnotes.local.login_manager.logout()
-	webnotes.commit()
+	webnotes.conn.commit()
 
 @webnotes.whitelist()
 def uploadfile():