PEP8 style fixes and other small style fixes

I used autopep8 on some files and did carefully check the changes.
I ignored E501,E302,E231,E225,E222,E221,E241,E203 in my search, and at
least E501 on any autopep8 run.

Other style fixes not related to PEP8:
* Only use new-style classes. I don't think the usage of old-style
  classes was voluntary. Old-style classes are removed in Python 3.
* Convert an if/else to a one-liner in mediawiki, change docstring style
  change to a comment something that wasn't really appropriate for a
  docstring.
* Unneeded first if condition in meteofrance
This commit is contained in:
Laurent Bachelier 2012-03-14 03:24:02 +01:00
commit 006e97a8be
99 changed files with 441 additions and 350 deletions

View file

@ -21,18 +21,20 @@
import hashlib
import Image
class TileError(Exception):
def __init__(self, msg, tile = None):
def __init__(self, msg, tile=None):
Exception.__init__(self, msg)
self.tile = tile
class Captcha:
class Captcha(object):
def __init__(self, file, infos):
self.inim = Image.open(file)
self.infos = infos
self.nbr = int(infos["nblignes"])
self.nbc = int(infos["nbcolonnes"])
(self.nx,self.ny) = self.inim.size
(self.nx, self.ny) = self.inim.size
self.inmat = self.inim.load()
self.map = {}
@ -77,7 +79,7 @@ class Captcha:
self.map[num] = tile
class Tile:
class Tile(object):
hash = {'ff1441b2c5f90703ef04e688e399aca5': 1,
'53d7f3dfd64f54723b231fc398b6be57': 2,
'5bcba7fa2107ba9a606e8d0131c162eb': 3,
@ -116,4 +118,3 @@ class Tile:
def display(self):
print self.checksum()

View file

@ -21,7 +21,9 @@
from .accounts_list import AccountsList
from .login import LoginPage, BadLoginPage
class AccountPrelevement(AccountsList): pass
class AccountPrelevement(AccountsList):
pass
__all__ = ['LoginPage',
'BadLoginPage',

View file

@ -53,11 +53,11 @@ class LoginPage(BasePage):
infos_xml = etree.XML(infos_data)
infos = {}
for el in ("cryptogramme", "nblignes", "nbcolonnes"):
infos[el] = infos_xml.find(el).text
infos[el] = infos_xml.find(el).text
infos["grille"] = ""
for g in infos_xml.findall("grille"):
infos["grille"] += g.text + ","
infos["grille"] += g.text + ","
infos["keyCodes"] = infos["grille"].split(",")
url = base_url + '/cvcsgenimage?modeClavier=0&cryptogramme=' + infos["cryptogramme"]
@ -79,5 +79,6 @@ class LoginPage(BasePage):
self.browser['cryptocvcs'] = infos["cryptogramme"]
self.browser.submit()
class BadLoginPage(BasePage):
pass