scylla-cqlsh 6.0.19__cp39-cp39-win_amd64.whl → 6.0.21__cp39-cp39-win_amd64.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,9 +1,9 @@
-copyutil.cp39-win_amd64.pyd,sha256=HCvmJvAtcaIqi5aeVNmZmBrWNYUAlFnaTrZlCkK456U,1163776
+copyutil.cp39-win_amd64.pyd,sha256=EAq3SseRmLZV2jsw95qdGyCBav7ODfPl4XTWjoUQsDI,1163776
 cqlsh/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 cqlsh/__main__.py,sha256=x2NuvlSuAKwNCxiX07YoYfxog9JNAO759ZxnjBEcfus,231
-cqlsh/cqlsh.py,sha256=ynRbzKW4cKaLWz6Apg3JkyD7KcvtkFgqilgrt1pkCQQ,115053
+cqlsh/cqlsh.py,sha256=LdOs8vhjG_oimhOXGoyHd7Ijv6I5Qt0ysWORZrU--Rk,114602
 cqlshlib/__init__.py,sha256=3M0IQCsjdCGYEOBT20swSvqxV6V8vg_mu1uJig78Vmk,3274
-cqlshlib/_version.py,sha256=vZTcGTjX_kaPLeuXQdqpNpU6XM8o305_WEo7PP5YEuI,429
+cqlshlib/_version.py,sha256=brxR1ufbcy_t7g6J8ADd696yi3jZaiCzJFThbDZ3Sic,429
 cqlshlib/authproviderhandling.py,sha256=goFjJCO1FKuVCXU7KXlmlorx_cD_oIRlgpOeH13W--g,7254
 cqlshlib/copyutil.py,sha256=Pc4WaKg_W8IP4ZpuWEvoLOrJJGQTwRHTyOdqExfDro0,116171
 cqlshlib/cql3handling.py,sha256=NaPViE6v9K4S4ffBmmWzI3_U0Kd-HvBjKq3N6G4GLzI,60790
@@ -18,9 +18,9 @@ cqlshlib/sslhandling.py,sha256=XYdvON1WkWFQ5dg5ttpwpSQDgbqI58YJi8Lx1qTDtQA,4758
 cqlshlib/tracing.py,sha256=Krb-TkfWrUdxr17-2yZrW5DXKvBEQt-FYZAix_62Tes,3493
 cqlshlib/util.py,sha256=gHvzlTw1T9N1YzXdVPFptAt58EzyXpDRibAo8QB03I8,5240
 cqlshlib/wcwidth.py,sha256=zsoo9u3ZA3q8RL5Afb6ynRujqDdUZ9zlFIHGE8RkqyA,16244
-scylla_cqlsh-6.0.19.dist-info/LICENSE.txt,sha256=65AZdlqRQxiyMBv8nY6itMITk5jx9EkE_jHujbcDzbk,11564
-scylla_cqlsh-6.0.19.dist-info/METADATA,sha256=2zpyU0kRbhMV_ja-5GmXS3nypqrpHmU21pgqv5wg5Tg,2910
-scylla_cqlsh-6.0.19.dist-info/WHEEL,sha256=Z6c-bE0pUM47a70GvqO_SvH_XXU0lm62gEAKtoNJ08A,100
-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/RECORD,,
+scylla_cqlsh-6.0.21.dist-info/LICENSE.txt,sha256=65AZdlqRQxiyMBv8nY6itMITk5jx9EkE_jHujbcDzbk,11564
+scylla_cqlsh-6.0.21.dist-info/METADATA,sha256=ZFY2SP2ltrXaofw_ABIzC_uH-l3R_1iILkIv5KB6jSw,2910
+scylla_cqlsh-6.0.21.dist-info/WHEEL,sha256=tvPrvVHgbBvhe15Ur-bXSJ7hma1hpNZgt8g99acwZLE,99
+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/RECORD,,

{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: cp39-cp39-win_amd64