added onvif camera fix for non-virtual env installations (#8592)

* added fix for non-virtual env installations

* fixed new line at end of file

* moved import os to top of file
This commit is contained in:
matt2005 2017-07-24 14:22:12 +01:00 committed by Pascal Vizeli
parent a2abb4ae0a
commit 654ad41464

View File

@ -6,6 +6,7 @@ https://home-assistant.io/components/camera.onvif/
""" """
import asyncio import asyncio
import logging import logging
import os
import voluptuous as vol import voluptuous as vol
@ -54,6 +55,7 @@ class ONVIFCamera(Camera):
def __init__(self, hass, config): def __init__(self, hass, config):
"""Initialize a ONVIF camera.""" """Initialize a ONVIF camera."""
from onvif import ONVIFService from onvif import ONVIFService
import onvif
super().__init__() super().__init__()
self._name = config.get(CONF_NAME) self._name = config.get(CONF_NAME)
@ -63,7 +65,7 @@ class ONVIFCamera(Camera):
config.get(CONF_HOST), config.get(CONF_PORT)), config.get(CONF_HOST), config.get(CONF_PORT)),
config.get(CONF_USERNAME), config.get(CONF_USERNAME),
config.get(CONF_PASSWORD), config.get(CONF_PASSWORD),
'{}/deps/onvif/wsdl/media.wsdl'.format(hass.config.config_dir) '{}/wsdl/media.wsdl'.format(os.path.dirname(onvif.__file__))
) )
self._input = media.GetStreamUri().Uri self._input = media.GetStreamUri().Uri
_LOGGER.debug("ONVIF Camera Using the following URL for %s: %s", _LOGGER.debug("ONVIF Camera Using the following URL for %s: %s",