Skip to content

Handle Switchs with restricted ports #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Handle Switchs with restricted ports #41

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cae0fff
Update dlipower.py
cclose Aug 11, 2018
2d047cf
Merge pull request #1 from cclose/cclose-patch-1
cclose Aug 11, 2018
17de31e
Update dlipower.py
cclose Aug 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions dlipower/dlipower.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,11 +429,16 @@ def determine_outlet(self, outlet=None):
returned outlet is an int
"""
outlets = self.statuslist()
if outlet and outlets and isinstance(outlet, str):
if outlet and outlets and (isinstance(outlet, str) or isinstance(outlet, int)):
for plug in outlets:
plug_name = plug[1]
if plug_name and plug_name.strip() == outlet.strip():
return int(plug[0])
plug_number = int(plug[0])
if isinstance(outlet, str):
if plug_name and plug_name.strip() == outlet.strip():
return plug_number
elif isinstance(outlet, int):
if plug_number and plug_number == outlet:
return plug_number
try:
outlet_int = int(outlet)
if outlet_int <= 0 or outlet_int > self.__len__():
Expand Down