Revision: 4308 Author: cosoleto Date: 2007-09-16 14:51:43 +0000 (Sun, 16 Sep 2007)
Log Message: ----------- code cleanup, updated site_protected_list file
Modified Paths: -------------- trunk/pywikipedia/copyright/site_protected_list.txt trunk/pywikipedia/copyright_put.py trunk/pywikipedia/families/wikipedia_family.py trunk/pywikipedia/family.py trunk/pywikipedia/query.py trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/copyright/site_protected_list.txt =================================================================== --- trunk/pywikipedia/copyright/site_protected_list.txt 2007-09-16 14:35:41 UTC (rev 4307) +++ trunk/pywikipedia/copyright/site_protected_list.txt 2007-09-16 14:51:43 UTC (rev 4308) @@ -1,4 +1,7 @@ -sapere.it -cronologia.it -encarta.msn.com -treccani.it +britannica.com # On-line encyclopedia (publisher: Encyclop\xE6dia Britannica) +encarta.msn.com # On-line encyclopedia (publisher: Microsoft) +pbmstoria.it # On-line encycloedia (publisher: Bruno Mondadori) +sapere.it # On-line encyclopedia (publisher: De Agostini) +treccani.it # On-line encyclopedia (publisher: Istituto della Enciclopedia italiana) + +cronologia.it # Amateur site (author: Franco Gonzato)
Modified: trunk/pywikipedia/copyright_put.py =================================================================== --- trunk/pywikipedia/copyright_put.py 2007-09-16 14:35:41 UTC (rev 4307) +++ trunk/pywikipedia/copyright_put.py 2007-09-16 14:51:43 UTC (rev 4308) @@ -106,8 +106,7 @@
output += u"|%s||%s||%s||%s||%s\n|-\n" % (page.aslink(), en, gn, yn, mn)
- output += u"""|- -| |||||||| + output += u"""| |||||||| |- |'''%s'''||%s||%s||%s||%s |-
Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2007-09-16 14:35:41 UTC (rev 4307) +++ trunk/pywikipedia/families/wikipedia_family.py 2007-09-16 14:51:43 UTC (rev 4308) @@ -894,5 +894,6 @@ if code in self.latin1old: return 'utf-8', 'iso-8859-1' return self.code2encoding(code), + def shared_image_repository(self, code): return ('commons', 'commons')
Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2007-09-16 14:35:41 UTC (rev 4307) +++ trunk/pywikipedia/family.py 2007-09-16 14:51:43 UTC (rev 4308) @@ -2441,6 +2441,7 @@
def querypath(self, code): return '/w/query.php' + def apipath(self, code): return '/w/api.php'
Modified: trunk/pywikipedia/query.py =================================================================== --- trunk/pywikipedia/query.py 2007-09-16 14:35:41 UTC (rev 4307) +++ trunk/pywikipedia/query.py 2007-09-16 14:51:43 UTC (rev 4308) @@ -1,4 +1,4 @@ -""" Please describe your module here ;) """ +""" Please describe your module here ;) """
__version__ = '$Id$' import wikipedia
Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2007-09-16 14:35:41 UTC (rev 4307) +++ trunk/pywikipedia/wikipedia.py 2007-09-16 14:51:43 UTC (rev 4308) @@ -2157,7 +2157,7 @@ return self.fileUrl().startswith(u'http://upload.wikimedia.org/wikipedia/commons/')
def fileIsShared(self): - if self.site().shared_image_repository()[0] == 'wikitravel_shared': + if 'wikitravel_shared' in self.site().shared_image_repository(): return self.fileUrl().startswith(u'http://wikitravel.org/upload/shared/') return self.fileIsOnCommons()