[PYTHON-1174] Allow server versions as long as we recognize the major version

Author: TheRealFalcon

CHANGELOG.rst

@@ -8,7 +8,8 @@ Features
 * ssl context and cloud support for Eventlet (PYTHON-1162)
 * Cloud Twisted support (PYTHON-1163)
 * Add additional_write_policy and read_repair to system schema parsing (PYTHON-1048)
-* Remove *read_repair_chance* table options (PYTHON-1140)
+* Remove *read_repair_chance table options (PYTHON-1140)
+* Flexible version parsing (PYTHON-1174)
 * [GRAPH] Ability to execute Fluent Graph queries asynchronously (PYTHON-1129)
 
 Bug Fixes

cassandra/util.py

@@ -1929,19 +1929,31 @@ def __init__(self, version):
             version_without_prerelease = version
         parts = list(reversed(version_without_prerelease.split('.')))
         if len(parts) > 4:
-            raise ValueError("Invalid version: {}. Only 4 "
-                             "components plus prerelease are supported".format(version))
+            prerelease_string = "-{}".format(self.prerelease) if self.prerelease else ""
+            log.warning("Unrecognized version: {}. Only 4 components plus prerelease are supported. "
+                        "Assuming version as {}{}".format(version, '.'.join(parts[:-5:-1]), prerelease_string))
 
-        self.major = int(parts.pop())
-        self.minor = int(parts.pop()) if parts else 0
-        self.patch = int(parts.pop()) if parts else 0
+        try:
+            self.major = int(parts.pop())
+        except ValueError:
+            six.reraise(
+                ValueError,
+                ValueError("Couldn't parse version {}. Version should start with a number".format(version)),
+                sys.exc_info()[2]
+            )
+        try:
+            self.minor = int(parts.pop()) if parts else 0
+            self.patch = int(parts.pop()) if parts else 0
 
-        if parts:  # we have a build version
-            build = parts.pop()
-            try:
-                self.build = int(build)
-            except ValueError:
-                self.build = build
+            if parts:  # we have a build version
+                build = parts.pop()
+                try:
+                    self.build = int(build)
+                except ValueError:
+                    self.build = build
+        except ValueError:
+            assumed_version = "{}.{}.{}.{}-{}".format(self.major, self.minor, self.patch, self.build, self.prerelease)
+            log.warning("Unrecognized version {}. Assuming version as {}".format(version, assumed_version))
 
     def __hash__(self):
         return self._version

tests/unit/test_util_types.py

@@ -217,6 +217,11 @@ def test_version_parsing(self):
             ('3.55.1.build12', (3, 55, 1, 'build12', 0)),
             ('3.55.1.20190429-TEST', (3, 55, 1, 20190429, 'TEST')),
             ('4.0-SNAPSHOT', (4, 0, 0, 0, 'SNAPSHOT')),
+            ('1.0.5.4.3', (1, 0, 5, 4, 0)),
+            ('1-SNAPSHOT', (1, 0, 0, 0, 'SNAPSHOT')),
+            ('4.0.1.2.3.4.5-ABC-123-SNAP-TEST.blah', (4, 0, 1, 2, 'ABC-123-SNAP-TEST.blah')),
+            ('2.1.hello', (2, 1, 0, 0, 0)),
+            ('2.test.1', (2, 0, 0, 0, 0)),
         ]
 
         for str_version, expected_result in versions:
@@ -229,18 +234,9 @@ def test_version_parsing(self):
             self.assertEqual(v.prerelease, expected_result[4])
 
         # not supported version formats
-        with self.assertRaises(ValueError):
-            Version('2.1.hello')
-
-        with self.assertRaises(ValueError):
-            Version('2.test.1')
-
         with self.assertRaises(ValueError):
             Version('test.1.0')
 
-        with self.assertRaises(ValueError):
-            Version('1.0.0.0.1')
-
     def test_version_compare(self):
         # just tests a bunch of versions