Revision: 4388 Author: btongminh Date: 2007-09-29 18:40:08 +0000 (Sat, 29 Sep 2007)
Log Message: ----------- A fix so that image_replacer works as well.
Modified Paths: -------------- trunk/pywikipedia/commonsdelinker/delinker.py trunk/pywikipedia/commonsdelinker/image_replacer.py trunk/pywikipedia/delinker.py
Modified: trunk/pywikipedia/commonsdelinker/delinker.py =================================================================== --- trunk/pywikipedia/commonsdelinker/delinker.py 2007-09-29 14:49:01 UTC (rev 4387) +++ trunk/pywikipedia/commonsdelinker/delinker.py 2007-09-29 18:40:08 UTC (rev 4388) @@ -767,7 +767,9 @@ else: sys.stderr.flush() -if __name__ == '__main__': +def main(): + global CD + output(u'Running ' + __version__) CD = CommonsDelinker() output(u'This bot runs from: ' + str(CD.site)) @@ -808,3 +810,5 @@ # Flush the standard streams sys.stdout.flush() sys.stderr.flush() + +if __name__ == '__main__': main()
Modified: trunk/pywikipedia/commonsdelinker/image_replacer.py =================================================================== --- trunk/pywikipedia/commonsdelinker/image_replacer.py 2007-09-29 14:49:01 UTC (rev 4387) +++ trunk/pywikipedia/commonsdelinker/image_replacer.py 2007-09-29 18:40:08 UTC (rev 4388) @@ -256,20 +256,24 @@ (old_image, new_image))
-if __name__ == '__main__': +def main(): + global R + import sys, traceback output(u'Running ' + __version__)
try: try: # FIXME: Add support for single-process replacer. - r = Replacer() - output(u'This bot runs from: ' + str(r.site)) - r.start() + R = Replacer() + output(u'This bot runs from: ' + str(R.site)) + R.start() except Exception, e: if type(e) not in (SystemExit, KeyboardInterrupt): output('A critical error has occured! Aborting!') traceback.print_exc(file = sys.stderr) finally: - r.reporters.exit() - wikipedia.stopme() \ No newline at end of file + R.reporters.exit() + wikipedia.stopme() + +if __name__ == '__main__': main()
Modified: trunk/pywikipedia/delinker.py =================================================================== --- trunk/pywikipedia/delinker.py 2007-09-29 14:49:01 UTC (rev 4387) +++ trunk/pywikipedia/delinker.py 2007-09-29 18:40:08 UTC (rev 4388) @@ -1,14 +1,17 @@ -# Helper script for delinker and image_replacer - -__version__ = '$Id$' - -import sys -sys.path.append('commonsdelinker') - -module = 'delinker' -if len(sys.argv) > 1: - if sys.argv[1] == 'replacer': - del sys.argv[1] - module = 'image_replacer' - -__import__(module, locals = {'__name__': '__main__'}) \ No newline at end of file +# Helper script for delinker and image_replacer + +__version__ = '$Id: $' + +import wikipedia, config + +import sys, os +sys.path.insert(0, 'commonsdelinker') + +module = 'delinker' +if len(sys.argv) > 1: + if sys.argv[1] == 'replacer': + del sys.argv[1] + module = 'image_replacer' + +bot = __import__(module) +bot.main() \ No newline at end of file