From c74dd89027a9e2a1c8829ffe01b9ab550e27f5ff Mon Sep 17 00:00:00 2001 From: Dpeta Date: Thu, 15 Jul 2021 23:54:48 +0200 Subject: [PATCH 1/2] Excluded modules that hopefully aren't required (can't recall if I tested this) --- setup.py | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index aa00a14..9d49851 100644 --- a/setup.py +++ b/setup.py @@ -38,13 +38,28 @@ build_exe_options = { ## "re", ## "oyoyo", ## "ssl"], - "excludes": ["collections.sys", - "collections._sre", - "collections._json", - "collections._locale", - "collections._struct", - "collections.array", - "collections._weakref"], + "excludes": ['collections.sys', + 'collections._sre', + 'collections._json', + 'collections._locale', + 'collections._struct', + 'collections.array', + '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( From 83343238ddc12ec9c549c5b2b2f66d9470049f64 Mon Sep 17 00:00:00 2001 From: Dpeta Date: Mon, 26 Jul 2021 13:59:25 +0200 Subject: [PATCH 2/2] Fixed crash on opening invite-only memo without being invited --- CHANGELOG.md | 5 ++++- memos.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a5b439..020c51d 100644 --- a/CHANGELOG.md +++ b/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'. diff --git a/memos.py b/memos.py index ed461b7..9683ddd 100644 --- a/memos.py +++ b/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