forked from home-assistant/core
- Removed https://github.com/rkabadi/pyedimax as submodule
- Added https://github.com/rkabadi/pyedimax to requirements - Modified edimax.py to import pyedimax from python3 default packages
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -22,6 +22,3 @@
|
||||
[submodule "homeassistant/external/pymysensors"]
|
||||
path = homeassistant/external/pymysensors
|
||||
url = https://github.com/theolind/pymysensors
|
||||
[submodule "homeassistant/external/pyedimax"]
|
||||
path = homeassistant/external/pyedimax
|
||||
url = https://github.com/rkabadi/pyedimax
|
||||
|
@@ -15,12 +15,10 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
|
||||
""" Find and return Edimax Smart Plugs. """
|
||||
try:
|
||||
# pylint: disable=no-name-in-module, import-error
|
||||
from homeassistant.external.pyedimax.smartplug import SmartPlug
|
||||
from pyedimax.smartplug import SmartPlug
|
||||
except ImportError:
|
||||
logging.getLogger(__name__).exception((
|
||||
"Failed to import pyedimax. "
|
||||
"Did you maybe not run `git submodule init` "
|
||||
"and `git submodule update`?"))
|
||||
"Failed to import pyedimax. "))
|
||||
|
||||
return
|
||||
|
||||
|
1
homeassistant/external/pyedimax
vendored
1
homeassistant/external/pyedimax
vendored
Submodule homeassistant/external/pyedimax deleted from 674ada04c4
@@ -79,3 +79,6 @@ PyMata==2.07a
|
||||
|
||||
# Mysensors serial gateway
|
||||
pyserial>=2.7
|
||||
|
||||
# PyEdimax
|
||||
git+https://github.com/rkabadi/pyedimax.git
|
Reference in New Issue
Block a user