Merge branch 'py3_pyqt5' of https://github.com/Dpeta/pesterchum-alt-servers into py3_pyqt5

CHANGELOG.md

@@ -1,12 +1,15 @@
 # Changelog
 (This document uses YYYY-MM-DD as per ISO 8601)
 
-## [v2.1.3] - 2021-5-3
+## [v2.1.3] - 2021-7-16
 
 ### Added
 - pyinstaller.py script to make building with pyinstaller more convenient.
 - Themes by cubicSimulation.
 
+### Fixed
+- Crash when opening invite-only memo. (My bad-)
+
 ### Changed
 - Honk emote now only triggers when typing ':honk:' instead of on every 'honk'.
 

memos.py

@@ -12,6 +12,7 @@ from parsetools import convertTags, addTimeInitial, timeProtocol, \
     lexMessage, colorBegin, colorEnd, mecmd, smiledict
 import parsetools
 from logviewer import PesterLogViewer
+import logging
 
 try:
     QString = unicode

setup.py

@@ -38,13 +38,28 @@ build_exe_options = {
 ##                 "re",
 ##                 "oyoyo",
 ##                 "ssl"],
-    "excludes": ["collections.sys",
+    "excludes": ['collections.sys',
-                 "collections._sre",
+        'collections._sre',
-                 "collections._json",
+        'collections._json',
-                 "collections._locale",
+        'collections._locale',
-                 "collections._struct",
+        'collections._struct',
-                 "collections.array",
+        'collections.array',
-                 "collections._weakref"],
+        'collections._weakref',
+        'PyQt5.QtMultimedia',
+        'PyQt5.QtDBus',
+        'PyQt5.QtDeclarative',
+        'PyQt5.QtHelp',
+        'PyQt5.QtNetwork',
+        'PyQt5.QtSql',
+        'PyQt5.QtSvg',
+        'PyQt5.QtTest',
+        'PyQt5.QtWebKit',
+        'PyQt5.QtXml',
+        'PyQt5.QtXmlPatterns',
+        'PyQt5.phonon',
+        'PyQt5.QtAssistant',
+        'PyQt5.QtDesigner',
+        'PyQt5.QAxContainer',],
     "include_files": includefiles,
     "include_msvcr": True
 }
@@ -94,7 +109,7 @@ bdist_msi_options = {'data': msi_data,
                          'keywords': "Pesterchum"},
                      'upgrade_code': "{86740d75-f1f2-48e8-8266-f36395a2d77f}",
                      'add_to_path': False, # !!!
-                     'all_users': True,
+                     'all_users': False,
                      'install_icon': "pesterchum.ico"}
 
 setup(