fixed sillent tcp/ip fallbacks inside pymysql

Author: gfrlv

mycli/main.py

@@ -430,13 +430,27 @@ def _connect():
                 else:
                     raise e
 
+        def _fallback_to_tcp_ip():
+            self.echo(
+                'Retrying over TCP/IP', err=True)
+
+            # Else fall back to TCP/IP localhost
+            nonlocal socket, host, port
+            socket = ""
+            host = 'localhost'
+            port = 3306
+            _connect()
+
         try:
             if (host is None) and not WIN:
                 # Try a sensible default socket first (simplifies auth)
                 # If we get a connection error, try tcp/ip localhost
                 try:
                     socket = socket or guess_socket_location()
                     _connect()
+                except FileNotFoundError:
+                    self.echo('Failed to find socket file at default locations')
+                    _fallback_to_tcp_ip()
                 except OperationalError as e:
                     # These are "Can't open socket" and 2x "Can't connect"
                     if [code for code in (2001, 2002, 2003) if code == e.args[0]]:
@@ -447,14 +461,7 @@ def _connect():
                         self.echo(
                             "Failed to connect to local MySQL server through socket '{}':".format(socket))
                         self.echo(str(e), err=True)
-                        self.echo(
-                            'Retrying over TCP/IP', err=True)
-
-                        # Else fall back to TCP/IP localhost
-                        socket = ""
-                        host = 'localhost'
-                        port = 3306
-                        _connect()
+                        _fallback_to_tcp_ip()
                     else:
                         raise e
                 else:

mycli/packages/filepaths.py

@@ -99,7 +99,8 @@ def guess_socket_location():
     for directory in socket_dirs:
         for r, dirs, files in os.walk(directory, topdown=True):
             for filename in files:
-                if filename.startswith("mysql") and filename.endswith(".socket"):
+                name, ext = os.path.splitext(filename)
+                if name.startswith("mysql") and ext in ('.socket', '.sock'):
                     return os.path.join(r, filename)
             dirs[:] = [d for d in dirs if d.startswith("mysql")]
-    return ""
+    raise FileNotFoundError