@@ -28,6 +28,4 @@ def geocode(s, api_key='', geocoder='google', list_geocoders=False): name, (lat, lon) = mod.geocoder(api_key)(s) print '%s\t%s\t%s' % (name, lat, lon) -if __name__ == '__main__': - optfunc.run(geocode) - \ No newline at end of file +optfunc.main(geocode) geocode.py @@ -129,6 +129,11 @@ def run(func, argv=None, stderr=sys.stderr): stderr.write('%s: ' % func.__name__) stderr.write("%s\n" % '\n'.join(errors)) +def main(*args, **kwargs): + prev_frame = inspect.stack()[-1][0] + if inspect.getmodule(prev_frame).__name__ == '__main__': + run(*args, **kwargs) + # Decorators def notstrict(fn): fn.optfunc_notstrict = True optfunc.py @@ -10,5 +10,4 @@ def two(arg): def three(arg): print "Three: %s" % arg -if __name__ == '__main__': - optfunc.run([one, two, three]) +optfunc.main([one, two, three]) subcommands_demo.py 2bc96ec80fded47eda9b4ff8ae99c4e5c9f826dd Simon Willison simon@simonwillison.net http://github.com/simonw/optfunc/commit/f7ba9965e4e7f4028b336053887ffbcbb47d898f f7ba9965e4e7f4028b336053887ffbcbb47d898f 2009-05-29T05:38:54-07:00 2009-05-29T05:38:54-07:00 optfunc.main() - like optfunc.run(), but it peeks at the stack and uses it to decide if __name__ == '__main__', saving you from having to type that idiom yourself 815b98c2f2868a11648832600a88012ed0134367 Simon Willison simon@simonwillison.net