Merge branch 'stable' into main

ChangeLog.md

@@ -1,6 +1,17 @@
 This is the master changelog for Elite Dangerous Market Connector.  Entries are in reverse chronological order (latest first).
 ---
 
+Release 4.1.4
+===
+
+The only change from 4.1.3 is to insert some Windows version checks before
+even attempting to set a UTF-8 encoding.  We'll now only attempt this if the
+user is *not* on Windows, or is on at least Windows 10 1903.
+
+For unknown reasons no exception was being thrown under some circumstances (in
+this case running under an earlier Windows 10, but with EDMarketConnector.exe
+set to run in Windows 7 compatibility mode for some unknown reason).
+
 Release 4.1.3
 ===
 

EDMarketConnector.py

@@ -1123,6 +1123,22 @@ sys.path: {sys.path}'''
         locale_startup = locale.getlocale(locale.LC_CTYPE)
         logger.debug(f'Locale LC_CTYPE: {locale_startup}')
 
+        # Older Windows Versions and builds have issues with UTF-8, so only
+        # even attempt this where we think it will be safe.
+
+        if sys.platform == 'win32':
+            windows_ver = sys.getwindowsversion()
+
+        # <https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1903_(May_2019_Update)>
+        # Windows 19, 1903 was build 18362
+        if (
+                sys.platform != 'win32'
+                or (
+                    windows_ver.major == 10
+                    and windows_ver.build >= 18362
+                )
+                or windows_ver.major > 10  # Paranoid future check
+        ):
             # Set that same language, but utf8 encoding (it was probably cp1252
             # or equivalent for other languages).
             # UTF-8, not utf8: <https://en.wikipedia.org/wiki/UTF-8#Naming>
@@ -1130,8 +1146,11 @@ sys.path: {sys.path}'''
                 # locale_startup[0] is the 'language' portion
                 locale.setlocale(locale.LC_ALL, (locale_startup[0], 'UTF-8'))
 
-        except locale.Error as e:
+            except locale.Error:
-            logger.error(f"Could not set LC_ALL to ({locale_startup[0]}, 'UTF_8')", exc_info=e)
+                logger.exception(f"Could not set LC_ALL to ('{locale_startup[0]}', 'UTF_8')")
+
+            except Exception:
+                logger.exception(f"Exception other than locale.Error on setting LC_ALL=('{locale_startup[0]}', 'UTF_8')")
 
             else:
                 log_locale('After switching to UTF-8 encoding (same language)')

config.py

@@ -13,7 +13,7 @@ appcmdname = 'EDMC'
 # appversion **MUST** follow Semantic Versioning rules:
 # <https://semver.org/#semantic-versioning-specification-semver>
 # Major.Minor.Patch(-prerelease)(+buildmetadata)
-appversion = '4.1.3'  #-rc1+a872b5f'
+appversion = '4.1.4'  #-rc1+a872b5f'
 # For some things we want appversion without (possible) +build metadata
 appversion_nobuild = str(semantic_version.Version(appversion).truncate('prerelease'))
 copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD'

edmarketconnector.xml

@@ -168,11 +168,19 @@
 		<!-- Windows -->
 
 		<item>
-			<title>Release 4.1.3</title>
+			<title>Release 4.1.4</title>
 			<description>
 				<![CDATA[
 <style>body { font-family:"Segoe UI","Tahoma"; font-size: 75%; } h2 { font-family:"Segoe UI","Tahoma"; font-size: 105%; }</style>
 
+<h2>Release 4.1.4</h2>
+<p>The only change from 4.1.3 is to insert some Windows version checks before
+even attempting to set a UTF-8 encoding.  We'll now only attempt this if the
+user is <em>not</em> on Windows, or is on at least Windows 10 1903.</p>
+<p>For unknown reasons no exception was being thrown under some circumstances (in
+this case running under an earlier Windows 10, but with EDMarketConnector.exe
+set to run in Windows 7 compatibility mode for some unknown reason).</p>
+
 <h2>Release 4.1.3</h2>
 <ul>
 <li>
@@ -816,11 +824,11 @@ If any of your plugins are listed in that section then they will need updating,
 				]]>
 			</description>
 			<enclosure
-				url="https://github.com/EDCD/EDMarketConnector/releases/download/Release/4.1.3/EDMarketConnector_win_4.1.3.msi"
+				url="https://github.com/EDCD/EDMarketConnector/releases/download/Release/4.1.4/EDMarketConnector_win_4.1.4.msi"
 				sparkle:os="windows"
 				sparkle:installerArguments="/passive LAUNCH=yes"
-				sparkle:version="4.1.3"
+				sparkle:version="4.1.4"
-				length="11354112"
+				length="11341824"
 				type="application/octet-stream"
 			/>
 		</item>