Merge lp:~stefanor/ibid/external-modules-501728 into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

[Michael Gorven (mgorven)]

> +sys.path.insert(1, '.')

Ibid won't necessarily be started in the botdir -- options['base'] contains
the directory based on the location of the config file.

 review needs_fixing

review: Needs Fixing

[Michael Gorven (mgorven)]

 review approve

review: Approve

[Jonathan Hitchcock (vhata)]

I see what it's doing, but I don't know what effects it might have overall.

One way to find out...

review: Approve

=== modified file 'ibid/__init__.py'
--- ibid/__init__.py	2010-01-02 10:07:14 +0000
+++ ibid/__init__.py	2010-01-02 16:04:12 +0000
@@ -49,6 +49,7 @@
     for key, value in opts.items():
         options[key] = value
     options['base'] = dirname(options['config'])
+    sys.path.insert(0, options['base'])
 
     # Get Twisted to log to Python logging
     twisted.python.log.startLoggingWithObserver(twisted_log)
 
=== modified file 'ibid/core.py'
--- ibid/core.py	2009-12-30 22:01:38 +0000
+++ ibid/core.py	2010-01-02 16:04:12 +0000
@@ -180,6 +180,8 @@
             noload = List of plugins / plugin.Processors to skip automatically loading
             autoload = (Boolean) Load all plugins by default?
         """
+        # Sets up twisted.python so that we can iterate modules
+        __import__('ibid.plugins')
 
         load = 'load' in ibid.config.plugins and ibid.config.plugins['load'] or []
         noload = 'noload' in ibid.config.plugins and ibid.config.plugins['noload'] or []
 
=== modified file 'ibid/plugins/__init__.py'
--- ibid/plugins/__init__.py	2009-12-14 13:43:58 +0000
+++ ibid/plugins/__init__.py	2010-01-02 16:04:12 +0000
@@ -5,11 +5,14 @@
 import re
 
 from twisted.spread import pb
+from twisted.plugin import pluginPackagePaths
 from twisted.web import resource
 
 import ibid
 from ibid.compat import json
 
+__path__.extend(pluginPackagePaths(__name__))
+
 class Processor(object):
     """Base class for Ibid plugins.
     Processors receive events and (optionally) do things with them.
 
=== modified file 'scripts/ibid-db'
--- scripts/ibid-db	2009-12-20 20:17:17 +0000
+++ scripts/ibid-db	2010-01-02 16:04:13 +0000
@@ -5,11 +5,13 @@
 import logging
 from optparse import OptionParser, OptionGroup
 from os.path import exists
-from sys import stdin, stdout, stderr, exit
+from sys import path, stdin, stdout, stderr, exit
 
 from sqlalchemy import select, DateTime
 from twisted.python.modules import getModule
 
+path.insert(0, '.')
+
 import ibid
 from ibid.compat import json
 from ibid.config import FileConfig
 
=== modified file 'scripts/ibid-plugin'
--- scripts/ibid-plugin	2009-12-30 22:01:38 +0000
+++ scripts/ibid-plugin	2010-01-02 16:04:13 +0000
@@ -4,6 +4,7 @@
 from optparse import OptionParser
 from os import getenv
 from os.path import exists
+import sys
 
 try:
     import readline
@@ -14,6 +15,8 @@
 
 from sqlalchemy.exceptions import IntegrityError
 
+sys.path.insert(0, '.')
+
 import ibid
 import ibid.plugins
 from ibid.config import FileConfig
 
=== modified file 'scripts/ibid-setup'
--- scripts/ibid-setup	2009-12-20 20:17:17 +0000
+++ scripts/ibid-setup	2010-01-02 16:04:13 +0000
@@ -12,6 +12,8 @@
 from pkg_resources import resource_stream
 from twisted.python.modules import getModule
 
+sys.path.insert(0, '.')
+
 import ibid
 from ibid.config import FileConfig
 from ibid.core import DatabaseManager