Almtesh
/
homesfr
1
0
Fork 0
Code Issues 1 Pull Requests Releases 3 Wiki Activity

Correction du style 

Le style a été un peu corrigé à l'aide de pycodestyle
This commit is contained in:
Sasha MOREL 2018-02-22 21:29:53 +01:00
parent ca831382d7
commit bfe348ed48
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
homesfr.py
View File

@ -10,6 +10,13 @@ This is a wrap aroud website, this could stop working without prior notice
## Manage cameras
### Get video
from urllib import request
from http.cookiejar import CookieJar
from urllib.parse import urlencode
from xml.etree import ElementTree as ET
from urllib.error import HTTPError
from datetime import datetime
authors = (
'Gilles "Almtesh" Émilien MOREL',
)
@ -30,13 +37,6 @@ REMOTE_CONTROLER = 'REMOTE'
KEYPAD_CONTROLER = 'KEYPAD'
PRESENCE_CAMERA_DETECTOR = 'PIR_CAMERA'
from urllib import request
from http.cookiejar import CookieJar
from urllib.parse import urlencode
from xml.etree import ElementTree as ET
from urllib.error import HTTPError
from datetime import datetime
class Common ():
'''
Common ressources to the library's classes
@ -154,7 +154,7 @@ class Common ():
a = self.bytes2file (self.opener.open (url).read ())
a.seek (0)
b = ET.parse (a)
if id_label == None:
if id_label is None:
r = []
for i in b.findall (label):
r.append (build_tree (i))
@ -181,22 +181,22 @@ class HomeSFR (Common):
print ('Authors:')
for i in authors:
print (' - ' + i)
if username != None:
if username is not None:
print ('init with username ' + username)
if cookies != None:
if cookies is not None:
print ('init with cookies')
print ('debug = ' + str (debug))
print ('autologin = ' + str (autologin))
if (username == None or password == None) and cookies == None:
if (username is None or password is None) and cookies is None:
raise TypeError ('You must define either username AND password or cookies')
self.username = username
self.password = password
if self.username != None and self.password != None:
if self.username is not None and self.password is not None:
self.autologin = autologin
else:
self.autologin = False
if cookies == None:
if cookies is None:
self.cookies = CookieJar ()
elif type (cookies) == CookieJar:
self.cookies = cookies
@ -208,7 +208,7 @@ class HomeSFR (Common):
'''
Shows name, version, defined user and debug state
'''
if self.username != None:
if self.username is not None:
return (name + ' ' + version + '\nUser: ' + self.username + '\nDebug: ' + str (self.DEBUG))
else:
return (name + ' ' + version + '\nUser: Unknown (auth from cookie class)\nDebug: ' + str (self.DEBUG))
@ -237,7 +237,7 @@ class HomeSFR (Common):
Returns True if the login was a success, False either
This method will always return False if no username and password are defined
'''
if self.username != None and self.password != None:
if self.username is not None and self.password is not None:
self.opener.open (self.auth_referer)
data = self.auth_extra_fields
data [self.auth_user_field] = self.username
@ -257,7 +257,7 @@ class HomeSFR (Common):
'''
Trigger the autologin
'''
if (self.autologin and self.test_login () == False):
if (self.autologin and not self.test_login ()):
self.login ()
def logout (self):
@ -362,7 +362,7 @@ class HomeSFR (Common):
Get a Camera object from the sensor's id
'''
self.do_autologin ()
if (self.autologin and self.test_login () == False):
if (self.autologin and not self.test_login ()):
self.login ()
r = Camera (id, self.opener)
r.refresh ()