Merge lp:~stefanor/ibid/hardy-fixes into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

[Jonathan Hitchcock (vhata)]

What is up with the linebreaks on the last four lines of your diff?

review: Needs Information

[Michael Gorven (mgorven)]

 review approve

review: Approve

[lp:~stefanor/ibid/hardy-fixes]

831. By Stefano Rivera on 2010-01-12

Tidy whitespace

[Stefano Rivera (stefanor)]

> What is up with the linebreaks on the last four lines of your diff?

Care to re-review?

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/__init__.py'
--- ibid/plugins/__init__.py	2010-01-04 22:04:04 +0000
+++ ibid/plugins/__init__.py	2010-01-12 07:31:10 +0000
@@ -5,8 +5,18 @@
 import re
 
 from twisted.spread import pb
-from twisted.plugin import pluginPackagePaths
 from twisted.web import resource
+try:
+    from twisted.plugin import pluginPackagePaths
+except ImportError:
+    # Not available in Twisted 2.5.0 in Ubuntu hardy
+    # This is straight from twisted.plugin
+    import os.path
+    import sys
+    def pluginPackagePaths(name):
+        package = name.split('.')
+        return [os.path.abspath(os.path.join(x, *package)) for x in sys.path
+            if not os.path.exists(os.path.join(x, *package + ['__init__.py']))]
 
 import ibid
 from ibid.compat import json