From 78a8c105f48113d88402bb23f095729fc67a2df5 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Mon, 27 Mar 2017 16:57:55 -0700 Subject: [PATCH] First pass at re-implementing wx 2.8 preference --- pyfa.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pyfa.py b/pyfa.py index 3094f2cd9..af01c1033 100755 --- a/pyfa.py +++ b/pyfa.py @@ -275,6 +275,20 @@ if __name__ == "__main__": else: pyfalog.info("Running in a thawed state.") + # FIX THIS + try: + if options.force28 is True: + wxversion.select('2.8') + else: + wxversion.select(['3.0', '2.8']) + + if hasattr(sys, 'frozen'): + pyfalog.info("Running in frozen state. Skipping wx validation.") + pyfalog.debug("wxPython version: {0}.", wxversion.getInstalled()) + elif options.force28 is True: + # Remove existing wxPython + wxversion.select('2.8') + if hasattr(sys, 'frozen') and wx is not None: pyfalog.info("Running in frozen state with wx installed. Skipping wx validation.") pyfalog.debug("wxPython version: {0}.", wxversion.getInstalled())