diff -r e3ed5e2856d7 -r 277a93891db9 PluginProjectPyramid.py
--- a/PluginProjectPyramid.py Sat Nov 26 18:02:44 2022 +0100
+++ b/PluginProjectPyramid.py Wed Dec 21 10:12:45 2022 +0100
@@ -7,15 +7,20 @@
Module implementing the Pyramid project plugin.
"""
-import os
+import fnmatch
import glob
-import fnmatch
+import os
from PyQt6.QtCore import QCoreApplication, QObject, QTranslator
from eric7 import Preferences
from eric7.EricWidgets.EricApplication import ericApp
-from eric7.Globals import isWindowsPlatform, isMacPlatform
+
+try:
+ from eric7.SystemUtilities.OSUtilities import isMacPlatform, isWindowsPlatform
+except ImportError:
+ # imports for eric < 23.1
+ from eric7.Globals import isWindowsPlatform, isMacPlatform
from ProjectPyramid.Project import Project
@@ -24,7 +29,7 @@
author = "Detlev Offenbach <detlev@die-offenbachs.de>"
autoactivate = True
deactivateable = True
-version = "10.2.0"
+version = "10.3.0"
className = "ProjectPyramidPlugin"
packageName = "ProjectPyramid"
shortDescription = "Project support for Pyramid projects."
@@ -194,10 +199,10 @@
try:
# backward compatibility for eric7 < 22.12
from eric7.Project.ProjectBrowser import (
+ FormsBrowserFlag,
+ OthersBrowserFlag,
SourcesBrowserFlag,
- FormsBrowserFlag,
TranslationsBrowserFlag,
- OthersBrowserFlag,
)
Preferences.setProjectBrowserFlagsDefault(
