Clean up the Torrent object

As discussed on IRC, those huge constructors aren't ideal.
Includes misc pep8 fixes.

modules/gazelle/pages/torrents.py

@@ -39,6 +39,7 @@ __all__ = ['TorrentsPage']
 
 class TorrentsPage(BasePage):
     TORRENTID_REGEXP = re.compile('torrents\.php\?action=download&id=(\d+)')
+
     def format_url(self, url):
         return '%s://%s/%s' % (self.browser.PROTOCOL,
                                self.browser.DOMAIN,
@@ -106,12 +107,11 @@ class TorrentsPage(BasePage):
                     seeders = int(tds[-2].text)
                     leechers = int(tds[-1].text)
 
-                    torrent = Torrent(id,
-                                      title,
-                                      url=self.format_url(url),
-                                      size=size,
-                                      seeders=seeders,
-                                      leechers=leechers)
+                    torrent = Torrent(id, title)
+                    torrent.url = self.format_url(url)
+                    torrent.size = size
+                    torrent.seeders = seeders
+                    torrent.leechers = leechers
                     yield torrent
                 else:
                     debug('unknown attrib: %s' % tr.attrib)

modules/isohunt/pages/torrents.py

@@ -32,7 +32,7 @@ class TorrentsPage(BasePage):
             if tr.attrib.get('class', '') == 'hlRow':
                 # sometimes the first tr also has the attribute hlRow
                 # i use that to ditinct it from the others
-                if tr.attrib.has_key('onmouseout'):
+                if 'onmouseout' in tr.attrib:
                     atitle = tr.getchildren()[2].getchildren()[1]
                     title = atitle.text
                     if not title:
@@ -50,12 +50,12 @@ class TorrentsPage(BasePage):
                     seed = tr.getchildren()[4].text
                     leech = tr.getchildren()[5].text
                     url = 'https://isohunt.com/download/%s/mon_joli_torrent.torrent' % idt
-                    yield Torrent(idt,
-                                  title,
-                                  url=url,
-                                  size=get_bytes_size(size, u),
-                                  seeders=int(seed),
-                                  leechers=int(leech))
+                    torrent = Torrent(idt, title)
+                    torrent.url = url
+                    torrent.size = get_bytes_size(size, u)
+                    torrent.seeders = int(seed)
+                    torrent.leechers = int(leech)
+                    yield torrent
 
 
 class TorrentPage(BasePage):

modules/kickass/pages/torrents.py

@@ -22,6 +22,7 @@ try:
     from urlparse import parse_qs
 except ImportError:
     from cgi import parse_qs
+
 from urlparse import urlsplit
 
 from weboob.capabilities.torrent import Torrent
@@ -59,13 +60,13 @@ class TorrentsPage(BasePage):
                 seed = tr.getchildren()[4].text
                 leech = tr.getchildren()[5].text
 
-                yield Torrent(idt,
-                              title,
-                              url=url,
-                              filename=parse_qs(urlsplit(url).query).get('title', [None])[0],
-                              size=get_bytes_size(size, u),
-                              seeders=int(seed),
-                              leechers=int(leech))
+                torrent = Torrent(idt, title)
+                torrent.url = url
+                torrent.filename = parse_qs(urlsplit(url).query).get('title', [None])[0]
+                torrent.size = get_bytes_size(size, u)
+                torrent.seeders = int(seed)
+                torrent.leechers = int(leech)
+                yield torrent
 
 
 class TorrentPage(BasePage):

modules/piratebay/pages/torrents.py

@@ -55,12 +55,11 @@ class TorrentsPage(BasePage):
                 seed = tr.getchildren()[2].text
                 leech = tr.getchildren()[3].text
 
-                torrent = Torrent(idt,
-                                  title,
-                                  url=url,
-                                  size=self.unit(float(size), u),
-                                  seeders=int(seed),
-                                  leechers=int(leech))
+                torrent = Torrent(idt, title)
+                torrent.url = url
+                torrent.size = self.unit(float(size), u)
+                torrent.seeders = int(seed)
+                torrent.leechers = int(leech)
                 yield torrent
 
 

weboob/capabilities/torrent.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright(C) 2010-2011 Romain Bignon, Laurent Bachelier
+# Copyright(C) 2010-2012 Romain Bignon, Laurent Bachelier
 #
 # This file is part of weboob.
 #
@@ -19,26 +19,26 @@
 
 from datetime import datetime
 
-from .base import IBaseCap, CapBaseObject, NotLoaded
+from .base import IBaseCap, CapBaseObject
 
 
 __all__ = ['ICapTorrent', 'Torrent']
 
 
 class Torrent(CapBaseObject):
-    def __init__(self, id, name, date=NotLoaded, size=NotLoaded, url=NotLoaded,
-                       seeders=NotLoaded, leechers=NotLoaded, files=NotLoaded,
-                       description=NotLoaded, filename=NotLoaded):
+    def __init__(self, id, name):
         CapBaseObject.__init__(self, id)
         self.add_field('name', basestring, name)
-        self.add_field('size', (int,long,float), size)
-        self.add_field('date', datetime, date)
-        self.add_field('url', basestring, url)
-        self.add_field('seeders', int, seeders)
-        self.add_field('leechers', int, leechers)
-        self.add_field('files', list, files)
-        self.add_field('description', basestring, description)
-        self.add_field('filename', basestring, filename) # suggested name of the .torrent file
+        self.add_field('size', (int, long, float))
+        self.add_field('date', datetime)
+        self.add_field('url', basestring)
+        self.add_field('magnet', basestring)
+        self.add_field('seeders', int)
+        self.add_field('leechers', int)
+        self.add_field('files', list)
+        self.add_field('description', basestring)
+        self.add_field('filename', basestring)  # suggested name of the .torrent file
+
 
 class ICapTorrent(IBaseCap):
     def iter_torrents(self, pattern):