nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Code style fixes, mostly whitespace

Browse source
This commit is contained in:
Laurent Bachelier 2013-08-04 20:00:19 +02:00
commit 23a71d847b
12 changed files with 84 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

7
weboob/applications/boobank/boobank.py
View file

@ -88,7 +88,7 @@ class TransactionsFormatter(IFormatter):
else:
try:
_type = self.TYPES[obj.type]
except (IndexError,AttributeError):
except (IndexError, AttributeError):
_type = ''
label = obj.label
@ -115,6 +115,7 @@ class TransferFormatter(IFormatter):
result += u'Reason: %s\n' % obj.reason
return result
class InvestmentFormatter(IFormatter):
MANDATORY_FIELDS = ('label', 'quantity', 'unitvalue')
@ -134,7 +135,7 @@ class InvestmentFormatter(IFormatter):
self.tot_diff += diff
self.tot_valuation += obj.valuation
return u' %s %s %s %s %s %s' %\
return u' %s %s %s %s %s %s' % \
(self.colored('%-30s' % label[:30], 'red'),
self.colored('%-10s' % obj.code[:8], 'yellow') if not empty(obj.code) else ' ' * 10,
self.colored('%6d' % obj.quantity, 'yellow'),
@ -145,7 +146,7 @@ class InvestmentFormatter(IFormatter):
def flush(self):
self.output('-------------------------------+--------+----------+-----------+-----------+--------')
self.output(u' Total %s %s' %\
self.output(u' Total %s %s' %
(self.colored('%8.2f' % self.tot_valuation, 'yellow'),
self.colored('%8.2f' % self.tot_diff, 'green' if self.tot_diff >=0 else 'red')
))

8
weboob/applications/qcookboob/recipe.py
View file

@ -17,7 +17,9 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
import urllib, sys, codecs
import urllib
import sys
import codecs
from PyQt4.QtCore import Qt, SIGNAL
from PyQt4.QtGui import QFrame, QImage, QPixmap, QFileDialog
@ -85,11 +87,11 @@ class Recipe(QFrame):
if not empty(self.recipe.picture_url):
data = urllib.urlopen(self.recipe.picture_url).read()
img = QImage.fromData(data)
self.ui.imageLabel.setPixmap(QPixmap.fromImage(img).scaledToWidth(250,Qt.SmoothTransformation))
self.ui.imageLabel.setPixmap(QPixmap.fromImage(img).scaledToWidth(250, Qt.SmoothTransformation))
def export(self):
fileDial = QFileDialog(self, 'Export "%s" recipe' %
self.recipe.title, '%s.kreml' % self.recipe.title.replace('/',','), 'Krecipe file (*.kreml);;all files (*)')
self.recipe.title, '%s.kreml' % self.recipe.title.replace('/', ','), 'Krecipe file (*.kreml);;all files (*)')
fileDial.setAcceptMode(QFileDialog.AcceptSave)
fileDial.setLabelText(QFileDialog.Accept, 'Export recipe')
fileDial.setLabelText(QFileDialog.FileName, 'Recipe file name')

7
weboob/applications/qhandjoob/main_window.py
View file

@ -26,18 +26,20 @@ from weboob.capabilities.job import ICapJob
from .ui.main_window_ui import Ui_MainWindow
class JobListWidgetItem(QListWidgetItem):
def __init__(self, job, *args, **kwargs):
QListWidgetItem.__init__(self, *args, **kwargs)
self.job = job
def __lt__(self, other):
return self.job.publication_date < other.job.publication_date
return self.job.publication_date < other.job.publication_date
def setAttrs(self, storage):
text = u'%s - %s' % (self.job.backend, self.job.title)
text = u'%s - %s' % (self.job.backend, self.job.title)
self.setText(text)
class MainWindow(QtMainWindow):
def __init__(self, config, storage, weboob, parent=None):
QtMainWindow.__init__(self, parent)
@ -129,4 +131,3 @@ class MainWindow(QtMainWindow):
self.ui.jobFrame.show()
else:
self.ui.jobFrame.hide()

6
weboob/applications/weboorrents/weboorrents.py
View file

@ -18,7 +18,6 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
import sys
from weboob.capabilities.torrent import ICapTorrent, MagnetOnly
@ -56,7 +55,7 @@ class TorrentInfoFormatter(IFormatter):
for f in obj.files:
result += ' * %s\n' % f
result += '\n%sDescription%s\n' % (self.BOLD, self.NC)
result += '%s'%obj.description
result += '%s' % obj.description
return result
@ -71,6 +70,7 @@ class TorrentListFormatter(PrettyFormatter):
(5, 'green', None),
(10, 'green', 'bold'),
)
def _get_color(self, nb):
if empty(nb):
return self.colored('N/A', 'red')
@ -115,7 +115,7 @@ class Weboorrents(ReplApplication):
Get information about a torrent.
"""
torrent = self.get_object(id, 'get_torrent', ('description','files'))
torrent = self.get_object(id, 'get_torrent', ('description', 'files'))
if not torrent:
print >>sys.stderr, 'Torrent not found: %s' % id
return 3

9
weboob/capabilities/recipe.py
View file

@ -19,8 +19,12 @@
from .base import IBaseCap, CapBaseObject, StringField, IntField, Field, empty
import lxml.etree as ET
import base64, re, urllib
import base64
import re
import urllib
__all__ = ['Recipe', 'ICapRecipe']
@ -42,6 +46,7 @@ class Comment():
result += 'comment: %s' % self.text
return result
class Recipe(CapBaseObject):
"""
Recipe object.
@ -108,7 +113,7 @@ class Recipe(CapBaseObject):
datab64 = base64.encodestring(data)[:-1]
pictures = ET.SubElement(desc, 'pictures')
pic = ET.SubElement(pictures, 'pic', {'format' : 'JPEG', 'id' : '1'})
pic = ET.SubElement(pictures, 'pic', {'format': 'JPEG', 'id': '1'})
pic.text = ET.CDATA(datab64)
if not empty(self.ingredients):

3
weboob/core/ouiboube.py
View file

@ -18,8 +18,6 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
import os
import shutil
@ -39,6 +37,7 @@ __all__ = ['Weboob']
class VersionsMismatchError(ConfigError):
pass
class Weboob(object):
"""
The main class of Weboob, used to manage backends and call methods.