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

plugins/Math/local/__init__.py

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

plugins/Math/plugin.py

@@ -40,7 +40,7 @@ import supybot.utils as utils
 from supybot.commands import *
 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)
 

plugins/RSS/local/__init__.py

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

plugins/RSS/plugin.py

@@ -42,7 +42,7 @@ import supybot.ircutils as ircutils
 import supybot.registry as registry
 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):
     if not registry.isValidRegistryName(args[0]):

scripts/supybot

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

scripts/supybot-adduser

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

scripts/supybot-botchk

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

scripts/supybot-plugin-create

@@ -2,6 +2,7 @@
 
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
+# Copyright (c) 2009, James Vega
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -105,7 +106,7 @@ class %s(callbacks.Plugin):
 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.
 
 configTemplate = '''
@@ -253,12 +254,13 @@ def main():
         if name.endswith('.py'):
             name = name[:-3]
     copyright %= (realName, license)
+    pathname = name
 
     # Make the directory.
-    os.mkdir(name)
+    os.mkdir(pathname)
 
     def writeFile(filename, s):
-        fd = file(os.path.join(name, filename), 'w')
+        fd = file(os.path.join(pathname, filename), 'w')
         try:
             fd.write(s)
         finally:
@@ -271,6 +273,11 @@ def main():
     writeFile('test.py', testTemplate % (copyright, name, name))
     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
 
 if __name__ == '__main__':
@@ -282,4 +289,4 @@ if __name__ == '__main__':
         finished.  Obviously, nothing was written, but just run this script
         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:

scripts/supybot-plugin-doc

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

scripts/supybot-plugin-package

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

scripts/supybot-test

@@ -203,4 +203,4 @@ if __name__ == '__main__':
     if hasattr(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:

scripts/supybot-wizard

@@ -670,4 +670,4 @@ if __name__ == '__main__':
         it was done.  Unfortunately, I didn't get to write anything to file.
         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: