Merge branch 'master' of ssh://jemfinch@supybot.git.sourceforge.net/gitroot/supybot

This commit is contained in:
Jeremy Fincher 2009-03-12 13:49:15 -05:00
commit ce8b3a556f
14 changed files with 25 additions and 15 deletions

View File

@ -0,0 +1 @@
# Stub so local is a module, used for third-party modules

View File

@ -40,7 +40,7 @@ import supybot.utils as utils
from supybot.commands import * from supybot.commands import *
import supybot.callbacks as callbacks import supybot.callbacks as callbacks
convertcore = utils.python.universalImport('convertcore', 'our_convertcore') convertcore = utils.python.universalImport('local.convertcore')
baseArg = ('int', 'base', lambda i: i <= 36) baseArg = ('int', 'base', lambda i: i <= 36)

View File

@ -0,0 +1 @@
# Stub so local is a module, used for third-party modules

View File

@ -42,7 +42,7 @@ import supybot.ircutils as ircutils
import supybot.registry as registry import supybot.registry as registry
import supybot.callbacks as callbacks import supybot.callbacks as callbacks
feedparser = utils.python.universalImport('feedparser', 'our_feedparser') feedparser = utils.python.universalImport('feedparser', 'local.feedparser')
def getFeedName(irc, msg, args, state): def getFeedName(irc, msg, args, state):
if not registry.isValidRegistryName(args[0]): if not registry.isValidRegistryName(args[0]):

View File

@ -329,7 +329,6 @@ if __name__ == '__main__':
import supybot.plugins.Owner as Owner import supybot.plugins.Owner as Owner
owner = Owner.Class() owner = Owner.Class()
#irclib._callbacks.append(owner)
if options.profile: if options.profile:
import profile import profile
@ -339,4 +338,4 @@ if __name__ == '__main__':
main() main()
# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:

View File

@ -125,3 +125,5 @@ if __name__ == '__main__':
main() main()
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:

View File

@ -130,4 +130,4 @@ if __name__ == '__main__':
else: else:
sys.exit(0) sys.exit(0)
# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:

View File

@ -2,6 +2,7 @@
### ###
# Copyright (c) 2002-2005, Jeremiah Fincher # Copyright (c) 2002-2005, Jeremiah Fincher
# Copyright (c) 2009, James Vega
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -105,7 +106,7 @@ class %s(callbacks.Plugin):
Class = %s Class = %s
# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
'''.lstrip() # This removes the newlines that precede and follow the text. '''.lstrip() # This removes the newlines that precede and follow the text.
configTemplate = ''' configTemplate = '''
@ -253,12 +254,13 @@ def main():
if name.endswith('.py'): if name.endswith('.py'):
name = name[:-3] name = name[:-3]
copyright %= (realName, license) copyright %= (realName, license)
pathname = name
# Make the directory. # Make the directory.
os.mkdir(name) os.mkdir(pathname)
def writeFile(filename, s): def writeFile(filename, s):
fd = file(os.path.join(name, filename), 'w') fd = file(os.path.join(pathname, filename), 'w')
try: try:
fd.write(s) fd.write(s)
finally: finally:
@ -271,6 +273,11 @@ def main():
writeFile('test.py', testTemplate % (copyright, name, name)) writeFile('test.py', testTemplate % (copyright, name, name))
writeFile('README.txt', readmeTemplate) writeFile('README.txt', readmeTemplate)
pathname = os.path.join(pathname, 'local')
os.mkdir(pathname)
writeFile('__init__.py',
'# Stub so local is a module, used for third-party modules\n')
print 'Your new plugin template is in the %s directory.' % name print 'Your new plugin template is in the %s directory.' % name
if __name__ == '__main__': if __name__ == '__main__':
@ -282,4 +289,4 @@ if __name__ == '__main__':
finished. Obviously, nothing was written, but just run this script finished. Obviously, nothing was written, but just run this script
again whenever you want to generate a template for a plugin.""") again whenever you want to generate a template for a plugin.""")
# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:

View File

@ -241,4 +241,4 @@ if __name__ == '__main__':
shutil.rmtree(conf.supybot.directories.conf()) shutil.rmtree(conf.supybot.directories.conf())
shutil.rmtree(conf.supybot.directories.data()) shutil.rmtree(conf.supybot.directories.data())
# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=78: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=78:

View File

@ -51,4 +51,4 @@ if __name__ == '__main__':
tf.add(dirname, basename, True) tf.add(dirname, basename, True)
tf.close() tf.close()
# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:

View File

@ -203,4 +203,4 @@ if __name__ == '__main__':
if hasattr(unittest, 'asserts'): if hasattr(unittest, 'asserts'):
print 'Total asserts: %s' % unittest.asserts print 'Total asserts: %s' % unittest.asserts
# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:

View File

@ -670,4 +670,4 @@ if __name__ == '__main__':
it was done. Unfortunately, I didn't get to write anything to file. it was done. Unfortunately, I didn't get to write anything to file.
Please run the wizard again to completion.""") Please run the wizard again to completion.""")
# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: