Better string mapping of execution profiles object keys

aboudreault · aboudreault · commit 7a7d71679b48 · 2019-05-21T09:41:34.000-04:00
diff --git a/cassandra/cluster.py b/cassandra/cluster.py
@@ -2375,6 +2375,11 @@ def _create_response_future(self, query, parameters, trace, custom_payload,
             load_balancer=load_balancing_policy, start_time=start_time, speculative_execution_plan=spec_exec_plan,
             host=host)
 
+    def _execution_profile_to_string(self, name):
+        if name is EXEC_PROFILE_DEFAULT:
+            return 'EXEC_PROFILE_DEFAULT'
+        return '"%s"' % (name,)
+
     def get_execution_profile(self, name):
         """
         Returns the execution profile associated with the provided ``name``.
@@ -2385,7 +2390,9 @@ def get_execution_profile(self, name):
         try:
             return profiles[name]
         except KeyError:
-            raise ValueError("Invalid execution_profile: '%s'; valid profiles are %s" % (name, profiles.keys()))
+            eps = [self._execution_profile_to_string(ep) for ep in profiles.keys()]
+            raise ValueError("Invalid execution_profile: %s; valid profiles are: %s." % (
+                self._execution_profile_to_string(name), ', '.join(eps)))
 
     def _maybe_get_execution_profile(self, ep):
         return ep if isinstance(ep, ExecutionProfile) else self.get_execution_profile(ep)
