Swap coveralls implementations; add 2.6 compat.

Author: habnabit

.travis.yml

@@ -4,7 +4,7 @@ python:
   - "2.7"
 
 install:
-  - "pip install pytest Twisted python-coveralls . --use-mirrors"
+  - "pip install pytest Twisted coveralls-python . --use-mirrors"
 script:
   - "coverage run -a $(which py.test) test_parsley.py"
   - "coverage run -a $(which py.test) examples"

ometa/test/test_runtime.py

@@ -1,3 +1,4 @@
+import pytest
 import unittest
 from ometa.runtime import OMetaBase, ParseError, expected, eof
 
@@ -53,10 +54,10 @@ def test_exactlyFail(self):
 
         data = "foo"
         o = OMetaBase(data)
-        with self.assertRaises(ParseError) as e:
+        with pytest.raises(ParseError) as e:
             o.rule_exactly("g")
-        self.assertEquals(e.exception[1], expected(None, "g"))
-        self.assertEquals(e.exception[0], 0)
+        self.assertEquals(e.value[1], expected(None, "g"))
+        self.assertEquals(e.value[0], 0)
 
 
 
@@ -83,10 +84,10 @@ def test_tokenFailed(self):
         """
         data = "foozle"
         o = OMetaBase(data)
-        with self.assertRaises(ParseError) as e:
+        with pytest.raises(ParseError) as e:
             o.rule_token("fog")
-        self.assertEqual(e.exception[0], 2)
-        self.assertEqual(e.exception[1], expected("token", "fog"))
+        self.assertEqual(e.value[0], 2)
+        self.assertEqual(e.value[1], expected("token", "fog"))
 
 
     def test_many(self):
@@ -135,12 +136,12 @@ def test_orSimpleFailure(self):
         data = "foozle"
         o = OMetaBase(data)
 
-        with self.assertRaises(ParseError) as e:
+        with pytest.raises(ParseError) as e:
             o._or([lambda: o.token("fog"),
                    lambda: o.token("foozik"),
                    lambda: o.token("woozle")])
-        self.assertEqual(e.exception[0], 4)
-        self.assertEqual(e.exception[1], expected("token",  "foozik"))
+        self.assertEqual(e.value[0], 4)
+        self.assertEqual(e.value[1], expected("token",  "foozik"))
 
 
     def test_orFalseSuccess(self):
@@ -183,10 +184,10 @@ def test_notError(self):
 
         data = "xy"
         o = OMetaBase(data)
-        with self.assertRaises(ParseError) as e:
+        with pytest.raises(ParseError) as e:
             o._not(lambda: o.exactly("x"))
-        self.assertEqual(e.exception[0], 1)
-        self.assertEqual(e.exception[1], None)
+        self.assertEqual(e.value[0], 1)
+        self.assertEqual(e.value[1], None)
 
 
     def test_spaces(self):
@@ -216,9 +217,9 @@ def test_predFailure(self):
         """
 
         o = OMetaBase("")
-        with self.assertRaises(ParseError) as e:
+        with pytest.raises(ParseError) as e:
             o.pred(lambda: (False, ParseError(o.input, 0, None)))
-        self.assertEqual(e.exception, ParseError(o.input, 0, None))
+        self.assertEqual(e.value, ParseError(o.input, 0, None))
 
 
     def test_end(self):
@@ -227,9 +228,9 @@ def test_end(self):
         if input is left.
         """
         o = OMetaBase("abc")
-        with self.assertRaises(ParseError) as e:
+        with pytest.raises(ParseError) as e:
             o.rule_end()
-        self.assertEqual(e.exception, ParseError(o.input, 1, None))
+        self.assertEqual(e.value, ParseError(o.input, 1, None))
         o.many(o.rule_anything)
         self.assertEqual(o.rule_end(), (True, ParseError("abc", 3, None)))
 
@@ -242,9 +243,9 @@ def test_label(self):
         data = "ooops"
         label = 'CustomLabel'
         o = OMetaBase(data)
-        with self.assertRaises(ParseError) as e:
+        with pytest.raises(ParseError) as e:
             o.label(lambda: o.rule_exactly('x'), label)
-        self.assertEqual(e.exception,
+        self.assertEqual(e.value,
                          ParseError(o.input, 0, expected(label)).withMessage([("Custom Exception:", label, None)]))
 
     def test_letter(self):
@@ -254,9 +255,9 @@ def test_letter(self):
         o = OMetaBase("a1")
         v, e = o.rule_letter()
         self.assertEqual((v, e), ("a", ParseError(o.input, 0, None)))
-        with self.assertRaises(ParseError) as e:
+        with pytest.raises(ParseError) as e:
             o.rule_letter()
-        self.assertEqual(e.exception, ParseError(o.input, 1,
+        self.assertEqual(e.value, ParseError(o.input, 1,
                                                  expected("letter")))
 
 
@@ -269,9 +270,9 @@ def test_letterOrDigit(self):
         self.assertEqual((v, e), ("a", ParseError(None, 0, None)))
         v, e = o.rule_letterOrDigit()
         self.assertEqual((v, e), ("1", ParseError(None, 1, None)))
-        with self.assertRaises(ParseError) as e:
+        with pytest.raises(ParseError) as e:
             o.rule_letterOrDigit()
-        self.assertEqual(e.exception,
+        self.assertEqual(e.value,
                          ParseError(o.input, 2, expected("letter or digit")))
 
 
@@ -282,9 +283,9 @@ def test_digit(self):
         o = OMetaBase("1a")
         v, e = o.rule_digit()
         self.assertEqual((v, e), ("1", ParseError("1a", 0, None)))
-        with self.assertRaises(ParseError) as e:
+        with pytest.raises(ParseError) as e:
             o.rule_digit()
-        self.assertEqual(e.exception, ParseError(o.input, 1, expected("digit")))
+        self.assertEqual(e.value, ParseError(o.input, 1, expected("digit")))