From 416ceb1ef980b491f3d7ea5d0435998fea7b67fe Mon Sep 17 00:00:00 2001 From: j Date: Thu, 8 May 2008 12:43:35 +0200 Subject: [PATCH] better torrent tests, add getMovieId test --- ox/imdb.py | 4 ++++ ox/mininova.py | 5 ++--- ox/thepiratebay.py | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ox/imdb.py b/ox/imdb.py index 78b84b7..051f6ae 100644 --- a/ox/imdb.py +++ b/ox/imdb.py @@ -19,6 +19,10 @@ from oxutils.normalize import normalizeTitle, normalizeImdbId import google def getMovieId(title, director='', year=''): + ''' + >>> getMovieId('The Matrix') + '0133093' + ''' if year: title = "%s (%s)" % (title, year) if director: diff --git a/ox/mininova.py b/ox/mininova.py index 176375d..7ac421c 100644 --- a/ox/mininova.py +++ b/ox/mininova.py @@ -6,7 +6,6 @@ from datetime import datetime import re import socket from urllib import quote -import sha from oxutils.cache import getUrl, getUrlUnicode from oxutils import findRe, cache, stripTags, decodeHtml, getTorrentInfo, intValue, normalizeNewlines @@ -91,8 +90,8 @@ class Mininova(Torrent): ''' >>> Mininova('123') {} - >>> sha.sha(unicode(Mininova('1072195'))).hexdigest() - 'ec98268a0aeaef8292f7bcf3585d0bc3910b3fac' + >>> Mininova('1072195')['infohash'] + '72dfa59d2338e4a48c78cec9de25964cddb64104' ''' def __init__(self, mininovaId): self.data = getData(mininovaId) diff --git a/ox/thepiratebay.py b/ox/thepiratebay.py index b5ea4c0..85fb4d1 100644 --- a/ox/thepiratebay.py +++ b/ox/thepiratebay.py @@ -7,7 +7,7 @@ import re import socket from urllib import quote, urlencode from urllib2 import URLError -import sha + from oxutils.cache import getUrl, getUrlUnicode from oxutils import findRe, cache, stripTags, decodeHtml, getTorrentInfo, normalizeNewlines @@ -104,8 +104,8 @@ class Thepiratebay(Torrent): >>> Thepiratebay('123') {} - >>> sha.sha(unicode(Thepiratebay('3951349'))).hexdigest() - 'ef64e438e3eef6e6a05cac4eea56b9f0289d3f22' + >>> Thepiratebay('3951349')['infohash'] + '4e84415d36ed7b54066160c05a0b0f061898d12b' ''' def __init__(self, piratebayId): self.data = getData(piratebayId)