From 7d4b11f4ec93493dbbd75c242a495fe9e14e19f1 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 19 Apr 2016 22:59:29 -0700 Subject: [PATCH] Fix wrong merge --- homeassistant/components/http.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/homeassistant/components/http.py b/homeassistant/components/http.py index f06c793a6ef..b7eaa4dfd60 100644 --- a/homeassistant/components/http.py +++ b/homeassistant/components/http.py @@ -222,10 +222,6 @@ class RequestHandler(SimpleHTTPRequestHandler): if url.path not in [URL_ROOT, URL_API_EVENT_FORWARD]: data.pop(DATA_API_PASSWORD, None) - # we really shouldn't need to forward the password from here - if url.path not in [URL_ROOT, URL_API_EVENT_FORWARD]: - data.pop(DATA_API_PASSWORD, None) - if '_METHOD' in data: method = data.pop('_METHOD')