Merge branch '3.20-dev'

Author: TheRealFalcon

CHANGELOG.rst

@@ -7,6 +7,14 @@ Features
 * Allow passing ssl context for Twisted (PYTHON-1161)
 * Cloud Twisted support (PYTHON-1163)
 
+3.20.1
+======
+November 6, 2019
+
+Bug Fixes
+---------
+* ValueError: too many values to unpack (expected 2)" when there are two dashes in server version number (PYTHON-1172)
+
 3.20.0
 ======
 October 28, 2019

cassandra/util.py

@@ -1246,7 +1246,7 @@ class Version(object):
     def __init__(self, version):
         self._version = version
         if '-' in version:
-            version_without_prerelease, self.prerelease = version.split('-')
+            version_without_prerelease, self.prerelease = version.split('-', 1)
         else:
             version_without_prerelease = version
         parts = list(reversed(version_without_prerelease.split('.')))

tests/unit/test_util_types.py

@@ -292,3 +292,5 @@ def test_version_compare(self):
         self.assertTrue(Version('4.0.0.build6-SNAPSHOT') > Version('4.0.0.build5-SNAPSHOT'))
         self.assertTrue(Version('4.0-SNAPSHOT2') > Version('4.0-SNAPSHOT1'))
         self.assertTrue(Version('4.0-SNAPSHOT2') > Version('4.0.0-SNAPSHOT1'))
+
+        self.assertTrue(Version('4.0.0-alpha1-SNAPSHOT') > Version('4.0.0-SNAPSHOT'))