Merge lp:~stefanor/ibid/ibid-plugin-authenticate into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

Add an authenticate function to FakeAuth

[Max Rabkin (max-rabkin)]

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

[Ibid Branch Auto-Lander (ibid-tarmac)]

Attempt to merge into lp:ibid failed due to conflicts:

text conflict in scripts/ibid-plugin

[Ibid Branch Auto-Lander (ibid-tarmac)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Max Rabkin (max-rabkin)]

review: Approve

=== modified file 'scripts/ibid-plugin'
--- scripts/ibid-plugin	2010-10-26 12:04:19 +0000
+++ scripts/ibid-plugin	2011-03-15 10:01:24 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2009-2010, Michael Gorven, Stefano Rivera, Max Rabkin
+# Copyright (c) 2009-2011, Michael Gorven, Stefano Rivera, Max Rabkin
 # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
 
 from locale import getpreferredencoding
@@ -48,6 +48,12 @@
     def authorise(self, event, permission):
         return True
 
+    def authenticate(self, event, credential=None):
+        return True
+
+    def drop_caches(self):
+        return
+
 ibid.auth = FakeAuth()
 logging.basicConfig(level=logging.DEBUG)
 ibid.config = FileConfig("ibid.ini")