Allow string comprehensions with csemver objects

csemver/csemver.py

@@ -151,17 +151,24 @@ def _zip_vers(self, o):
 		return zip(list(self._version.values())[:4], list(o._version.values())[:4])
 
 	def __eq__(self, value):
-	 	if not isinstance(value,csemver):
+		if isinstance(value,str):
+			csem_val = csemver(value)
+			return self == csem_val
+
+		if not isinstance(value,csemver):
 	 		raise TypeError("This type combination is not supported!");
 
-	 	parts = self._zip_vers(value)
-	 	for i,v in parts:
-	 		if i != v:
-	 			return False
- 		return True
+		parts = self._zip_vers(value)
+		for i,v in parts:
+			if i != v:
+				return False
+		return True
 
 
 	def __gt__(self, value):
+		if isinstance(value,str):
+			csem_val = csemver(value)
+			return self > csem_val
 		if not isinstance(value,csemver):
 			raise TypeError("This type combination is not supported!");
 		parts = self._zip_vers(value)
@@ -197,6 +204,9 @@ def __gt__(self, value):
 		return False
 
 	def __lt__(self, value):
+		if isinstance(value,str):
+			csem_val = csemver(value)
+			return self < csem_val
 		if not isinstance(value,csemver):
 			raise TypeError("This type combination is not supported!");
 		parts = self._zip_vers(value)

tests/test.py

@@ -52,6 +52,14 @@ def test_del_version(self):
 		s.delNumber()
 		self.assertEqual(str(s),"0.1.0")
 
+	def test_del_op(self):
+		if sys.version_info < (3,0):
+			raise SkipTest("mustbe Python 3.0 or greater")
+		s = cs.parse("1.0.0")
+		self.assertEqual(s,"1.0.0")
+		del s.number
+		self.assertEqual(s, "0.1.0")
+
 	def test_addition(self):
 		a = cs.parse("0.0.1");
 		b = cs.parse("0.2.0");
@@ -92,6 +100,7 @@ def test_comprehension_greater(self):
 		b = cs.parse("0.1.0-pre")
 		self.assertTrue(a>b)
 		self.assertFalse(b>a)
+		self.assertTrue(a > "0.1.0-pre")
 
 	def test_comprehension_smaller(self):
 		a = cs.parse("1.0.0");
@@ -112,6 +121,7 @@ def test_comprehension_smaller(self):
 		b = cs.parse("0.1.0-pre.1")
 		self.assertTrue(a<b)
 		self.assertFalse(b<a)
+		self.assertTrue(a < "0.1.0-pre.1")
 
 	def test_comprehension_equal(self):
 		a = cs.parse("1.0.0");
@@ -134,11 +144,18 @@ def test_comprehension_equal(self):
 		b = cs.parse("1.0.0-pre+build");
 		self.assertFalse(a == b);
 
+		a = cs.parse("1.0.0")
+		self.assertTrue(a == "1.0.0")
+		self.assertFalse(a == "0.1.0")
+
 	def test_comprehension_not_equal(self):
 		a = cs.parse("1.0.0-pre+build");
 		b = cs.parse("1.0.0-pre+build1");
 		self.assertFalse(a != b);
 		self.assertTrue(a == b);
+		a = cs.parse("1.0.0")
+		self.assertTrue(a != "0.1.0")
+
 
 	def test_index_ops(self):
 		a = cs.parse(); # defaults to 0.1.0
@@ -204,6 +221,10 @@ def test_greater_equal(self):
 		self.assertFalse(a >= b)
 		self.assertTrue(b >= a)
 		self.assertTrue(a >= a)
+		self.assertTrue(b >= "1.0.0-pre")
+		self.assertTrue(b >= "1.0.0")
+		self.assertFalse(b >= "1.1.0")
+
 		a = cs.parse("1.0.0-pre.1.3")
 		b = cs.parse("1.0.0-pre.1")
 		self.assertTrue(a >= b)
@@ -217,6 +238,7 @@ def test_less_equal(self):
 		self.assertTrue(a <= b)
 		self.assertFalse(b <= a)
 		self.assertTrue(a <= a)
+		self.assertTrue(b <= "1.0.1")
 
 	def test_len(self):
 		a = cs.parse("1.0.0")