Fix some tests broken by the introduction of plugin managers; Add tox…

….ini to easily run tests on 2.6, 2.7, and 3.2

docs/index.rst

@@ -6,6 +6,9 @@
 Welcome to straight.plugin's documentation!
 ===========================================
 
+Straight Plugin is very easy.
+
+
 Contents:
 
 .. toctree::
@@ -20,7 +23,6 @@ Contents:
 Overview
 ========
 
-`straight.plugin` is very easy.
 
 Loading all the classes inside a namespace which are subclasses of some
 base is the preferred invocation of ``straight.plugin`` loading, and is

straight/plugin/loaders.py

@@ -34,7 +34,10 @@ def _post_fill(self):
                 plugins = self._cache
                 self._cache = self.load(implied_namespace)
                 self._post_fill()
-                self._cache = plugins + self._cache
+                combined = []
+                combined.extend(plugins)
+                combined.extend(self._cache)
+                self._cache = combined
 
     def _order(self):
         self._cache.sort(key=self._plugin_priority, reverse=True)

straight/plugin/manager.py

@@ -17,11 +17,11 @@ def produce(self, *args, **kwargs):
         factories.
         """
 
-        new_plugin_set = PluginManager()
+        new_plugins = []
         for p in self._plugins:
             r = p(*args, **kwargs)
-            new_plugin_set._plugins.append(r)
-        return new_plugin_set
+            new_plugins.append(r)
+        return PluginManager(new_plugins)
 
     def call(self, methodname, *args, **kwargs):
         """Call a common method on all the plugins, if it exists."""

tests.py

@@ -237,11 +237,10 @@ def test_plugin(self):
 class PluginManagerTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.m = manager.PluginManager()
-        self.m._plugins = [
+        self.m = manager.PluginManager([
             mock.Mock(),
             mock.Mock(),
-        ]
+        ])
 
     def test_first(self):
         self.m._plugins[0].x.return_value = 1

tox.ini

@@ -0,0 +1,5 @@
+[tox]
+envlist = py26,py27,py32
+[testenv]
+deps = mock
+commands=./tests.py