Fix cqlsh erroring out on Python 3.7 due to webbrowser module being a…

…bsent Patch by Yuki Morishita; Reviewed by Dinesh Joshi for CASSANDRA-15572
apache · Apr 7, 2020 · d069fd2 · d069fd2
1 parent aef3bec
commit d069fd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0-alpha4
+ * Fix cqlsh erroring out on Python 3.7 due to webbrowser module being absent (CASSANDRA-15572)
  * Fix IMH#acquireCapacity() to return correct Outcome when endpoint reserve runs out (CASSANDRA-15607)
  * Fix nodetool describering output (CASSANDRA-15682)
  * Only track ideal CL failure when request CL met (CASSANDRA-15696)

diff --git a/bin/cqlsh.py b/bin/cqlsh.py
@@ -96,7 +96,7 @@
 # >>> webbrowser._tryorder
 # >>> webbrowser._browser
 #
-if len(webbrowser._tryorder) == 0:
+if webbrowser._tryorder is None or len(webbrowser._tryorder) == 0:
     CASSANDRA_CQL_HTML = CASSANDRA_CQL_HTML_FALLBACK
 elif webbrowser._tryorder[0] == 'xdg-open' and os.environ.get('XDG_DATA_DIRS', '') == '':
     # only on Linux (some OS with xdg-open)