Make truncate argument to Linestack optional.

diff --git a/libirc/python/linestack.c b/libirc/python/linestack.c
index cf9dda0cbd9858b70f34d6670c3596e3268f6472..f8014e7c23d017a965f5ec2b7393d7530320d589 100644 (file)
--- a/libirc/python/linestack.c
+++ b/libirc/python/linestack.c
@@ -34,14 +34,14 @@ static int py_linestack_dealloc(PyLinestackObject *self)
 
 static PyObject *py_linestack_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 {
-    char *kwnames[] = { "path", "truncate", "state", NULL };
+    char *kwnames[] = { "path", "state", "truncate", NULL };
     PyLinestackObject *self;
        char *data_dir;
-       int truncate;
+       int truncate = FALSE;
        PyObject *py_state;
     struct irc_network_state *state;
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO", kwnames, 
-                                     &data_dir, &truncate, &py_state))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO|i", kwnames, 
+                                     &data_dir, &py_state, &truncate))
         return NULL;
 
     self = (PyLinestackObject *)type->tp_alloc(type, 0);

diff --git a/libirc/python/tests/test_irc.py b/libirc/python/tests/test_irc.py
index 993c5b830c7d0e34019a7949bbcaedbf8f61c4c7..5c3d516b56513cc029dca8f3e449d30c15d32f41 100644 (file)
--- a/libirc/python/tests/test_irc.py
+++ b/libirc/python/tests/test_irc.py
@@ -672,18 +672,18 @@ class LinestackTests(unittest.TestCase):
         return irc.NetworkState("nick", "user", "host")
 
     def test_create(self):
-        ls = irc.Linestack(self.get_path("network"), True, self.get_state())
+        ls = irc.Linestack(self.get_path("network"), self.get_state(), True)
         self.assertTrue(ls is not None)
 
     def test_insert_line(self):
         state = self.get_state()
-        ls = irc.Linestack(self.get_path("insert_line"), True, state)
+        ls = irc.Linestack(self.get_path("insert_line"), state, True)
         ls.insert_line(":somebody!some@host PRIVMSG #bla :BAR!", 
                        irc.TO_SERVER, state)
 
     def test_replay_simple(self):
         state1 = self.get_state()
-        ls = irc.Linestack(self.get_path("insert_line"), True, state1)
+        ls = irc.Linestack(self.get_path("insert_line"), state1, True)
         m = ls.get_marker()
         ls.insert_line(":somebody!some@host JOIN #bla", irc.FROM_SERVER, state1)
         state2 = self.get_state()
@@ -692,7 +692,7 @@ class LinestackTests(unittest.TestCase):
 
     def test_traverse(self):
         state = self.get_state()
-        ls = irc.Linestack(self.get_path("insert_line"), True, state)
+        ls = irc.Linestack(self.get_path("insert_line"), state, True)
         m1 = ls.get_marker()
         ls.insert_line(":somebody!some@host JOIN #bla", irc.FROM_SERVER, state)
         ls.insert_line(":somebody!some@host PRIVMSG #bla :BAR!",