scylla-cqlsh 6.0.19__cp311-cp311-macosx_10_9_x86_64.whl → 6.0.21__cp311-cp311-macosx_10_9_x86_64.whl

cqlsh/cqlsh.py

@@ -478,7 +478,7 @@ class Shell(cmd.Cmd):
             if protocol_version is not None:
                 kwargs['protocol_version'] = protocol_version
 
-            profiles = {
+            self.profiles = {
                 EXEC_PROFILE_DEFAULT: ExecutionProfile(consistency_level=cassandra.ConsistencyLevel.ONE,
                                                        request_timeout=request_timeout,
                                                        row_factory=ordered_dict_factory)
@@ -487,10 +487,10 @@ class Shell(cmd.Cmd):
             if cloudconf is None:
                 if os.path.exists(self.hostname) and stat.S_ISSOCK(os.stat(self.hostname).st_mode):
                     kwargs['contact_points'] = (UnixSocketEndPoint(self.hostname),)
-                    profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([UnixSocketEndPoint(self.hostname)])
+                    self.profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([UnixSocketEndPoint(self.hostname)])
                 else: 
                     kwargs['contact_points'] = (self.hostname,)
-                    profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([self.hostname])
+                    self.profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([self.hostname])
                 kwargs['port'] = self.port
                 kwargs['ssl_context'] = sslhandling.ssl_settings(hostname, CONFIG_FILE) if ssl else None
                 # workaround until driver would know not to lose the DNS names for `server_hostname`
@@ -503,7 +503,7 @@ class Shell(cmd.Cmd):
                                 auth_provider=self.auth_provider,
                                 control_connection_timeout=connect_timeout,
                                 connect_timeout=connect_timeout,
-                                execution_profiles=profiles,
+                                execution_profiles=self.profiles,
                                 **kwargs)
         self.owns_connection = not use_conn
 
@@ -2140,10 +2140,6 @@ class Shell(cmd.Cmd):
             kwargs['port'] = self.port
             kwargs['ssl_context'] = self.conn.ssl_context
             kwargs['ssl_options'] = self.conn.ssl_options
-            if os.path.exists(self.hostname) and stat.S_ISSOCK(os.stat(self.hostname).st_mode):
-                kwargs['load_balancing_policy'] = WhiteListRoundRobinPolicy([UnixSocketEndPoint(self.hostname)])
-            else: 
-                kwargs['load_balancing_policy'] = WhiteListRoundRobinPolicy([self.hostname])
         else:
             kwargs['scylla_cloud'] = self.cloudconf
 
@@ -2152,6 +2148,7 @@ class Shell(cmd.Cmd):
                        auth_provider=auth_provider,
                        control_connection_timeout=self.conn.connect_timeout,
                        connect_timeout=self.conn.connect_timeout,
+                       execution_profiles=self.profiles,
                        **kwargs)
 
         if self.current_keyspace:
@@ -2160,9 +2157,6 @@ class Shell(cmd.Cmd):
             session = conn.connect()
 
         # Copy session properties
-        session.default_timeout = self.session.default_timeout
-        session.row_factory = self.session.row_factory
-        session.default_consistency_level = self.session.default_consistency_level
         session.max_trace_wait = self.session.max_trace_wait
 
         # Update after we've connected in case we fail to authenticate

cqlshlib/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '6.0.19'
-__version_tuple__ = version_tuple = (6, 0, 19)
+__version__ = version = '6.0.21'
+__version_tuple__ = version_tuple = (6, 0, 21)

{scylla_cqlsh-6.0.19.dist-info → scylla_cqlsh-6.0.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scylla-cqlsh
-Version: 6.0.19
+Version: 6.0.21
 Summary: cqlsh is a Python-based command-line client for running CQL commands on a scylla cluster.
 Home-page: https://github.com/scylladb/scylla-cqlsh
 Author: Israel Fruchter

{scylla_cqlsh-6.0.19.dist-info → scylla_cqlsh-6.0.21.dist-info}/RECORD

@@ -1,16 +1,16 @@
-copyutil.cpython-311-darwin.so,sha256=iFSNy59Zb4zi1UBH2c5VS5fAUXJigh7wlokCFGaB46U,1625808
-scylla_cqlsh-6.0.19.dist-info/RECORD,,
-scylla_cqlsh-6.0.19.dist-info/WHEEL,sha256=3Ij8bI-sb8yCMxXItr4MLlNoRGZb2WoUxQe9xIFR_DQ,111
-scylla_cqlsh-6.0.19.dist-info/entry_points.txt,sha256=oE4unqgR3WwNkCJDGlMG1HYtCE3nEZZ4d9CIl-JSZyQ,46
-scylla_cqlsh-6.0.19.dist-info/top_level.txt,sha256=PVG-5w7PDG3FoAJH6Rq2I8C0y4cKa2KOW75GxjHkmQ4,24
-scylla_cqlsh-6.0.19.dist-info/LICENSE.txt,sha256=JAuKOf39K9OzU5wC40RmM0iE_ISwVrV_BunaNTI-zZc,11360
-scylla_cqlsh-6.0.19.dist-info/METADATA,sha256=OqDy7Znht-rfh7fgVvq4rC8-CtxcaZcAiwd9pN3VptA,2814
+copyutil.cpython-311-darwin.so,sha256=IsCv98MiqBMqm7drOILOanI07VlBtPJYIRKMy9tNDWw,1625808
+scylla_cqlsh-6.0.21.dist-info/RECORD,,
+scylla_cqlsh-6.0.21.dist-info/WHEEL,sha256=ODIUoelrE30qIP3QE2MgREcutdHO3GooqGCJk-TZIhg,110
+scylla_cqlsh-6.0.21.dist-info/entry_points.txt,sha256=oE4unqgR3WwNkCJDGlMG1HYtCE3nEZZ4d9CIl-JSZyQ,46
+scylla_cqlsh-6.0.21.dist-info/top_level.txt,sha256=PVG-5w7PDG3FoAJH6Rq2I8C0y4cKa2KOW75GxjHkmQ4,24
+scylla_cqlsh-6.0.21.dist-info/LICENSE.txt,sha256=JAuKOf39K9OzU5wC40RmM0iE_ISwVrV_BunaNTI-zZc,11360
+scylla_cqlsh-6.0.21.dist-info/METADATA,sha256=Nt65voJuRc4UHZ37DxsbH2z-jI8u7oF5Zbjkxb6jiR4,2814
 cqlshlib/authproviderhandling.py,sha256=p4r_sk64AC5eiv__n-gjwQk2Ni_CcK6lyAWSKEcgINs,7078
 cqlshlib/cqlshhandling.py,sha256=BUu9wi7H1Xgil9lci-48TCPQ1xwe2-OTNXsW7jiewlM,10510
 cqlshlib/tracing.py,sha256=ct7siXwNMINjGVXn9qr5h7XhDDM6Bi1uLljPUtcve-A,3403
 cqlshlib/sslhandling.py,sha256=TtEib4N-BuL2KZJiGYijc9DQviYp2lzYlwLj4RLp0oQ,4649
 cqlshlib/saferscanner.py,sha256=T4eSYVWuZf4piTS9PgHjFhuY6g1fOb4VVa1Bu4Y1v_I,3539
-cqlshlib/_version.py,sha256=83SpZBNnw0woA9Vz9Vm9uAiLPcVFE3xip1EgBKVBZLU,413
+cqlshlib/_version.py,sha256=exx4HNoWhdHaPXam5wx1R5E3mFHRbwqrLVHGWJ4Ftgs,413
 cqlshlib/wcwidth.py,sha256=PsbF7OaDlLItaiV6niu8F_OOgVYLJo0Ypb5-cOJV3QY,15865
 cqlshlib/displaying.py,sha256=bsA7T4BwQHgtH4jzCJeU3JrpgMT5k0xZ7EA2AnhYG7g,3977
 cqlshlib/util.py,sha256=qWQmq9v28vZwZ4apzK0-UQOYPIW3TMk-Jq9I69LbW0k,5057
@@ -21,6 +21,6 @@ cqlshlib/copyutil.py,sha256=mORX85C5CFqNSIoElATn4vKjUaCdUL8td5blyXlFDHI,113415
 cqlshlib/helptopics.py,sha256=bBPtNHn2ySgO9K4nFBpJw2gcibryIdRh7dm3b9TUubQ,4524
 cqlshlib/pylexotron.py,sha256=QY3nZ-fP-yGFIixMV33IgMlKV8A51AxnNYya0PGZc6I,19273
 cqlshlib/cql3handling.py,sha256=cAE_UW8sg4UJ8PjS5rbbZn-O3_L9m2297Or-8f2s72Y,59123
-cqlsh/cqlsh.py,sha256=IRX_82TLoHqFKjfJ4EaiXRDlth-Ijbv43pv6DjGz99A,112321
+cqlsh/cqlsh.py,sha256=NCGYLjMk-Qnt7HLr0OJnNfnoH-HGKbHx7nBUrBL8SEA,111876
 cqlsh/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 cqlsh/__main__.py,sha256=-IR7kYVwXf9uq9OBeVlAB5I386E1N9iEhrjn3sCw-74,220

{scylla_cqlsh-6.0.19.dist-info → scylla_cqlsh-6.0.21.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.0)
 Root-Is-Purelib: false
 Tag: cp311-cp311-macosx_10_9_x86_64