fix(action_manager): patch to support py37

change patching to (try eval + except), and now run black -l 80 to avoid hound warning There will be lots of violations in hound's eye which I cannot find out locally because hound's linter is not up to date. I will have to do some shattered commits, and for these commits, I will name them hop (hound oriented programming). Signed-off-by: TsXor <[email protected]>
loonghao · Sep 8, 2022 · b2b2b0e · b2b2b0e
1 parent 37bdb4a
commit b2b2b0e
Show file tree

Hide file tree

Showing 33 changed files with 777 additions and 654 deletions.
diff --git a/examples/apply_crystallize_filter_action.py b/examples/apply_crystallize_filter_action.py
@@ -31,10 +31,7 @@
     active_document.activeLayer = active_document.layerSets.item(len(nLayerSets)).artLayers.item(len(nArtLayers))
 
     def applyCrystallize(cellSize):
-        filter_dict = {
-            '_classID':None,
-            'ClSz':cellSize
-        }
+        filter_dict = {"_classID": None, "ClSz": cellSize}
         filter_desc = ps.ActionDescriptor.load(filter_dict)
         ps.app.executeAction(am.str2id("Crst"), filter_desc)
 

diff --git a/examples/convert_smartobject_to_layer.py b/examples/convert_smartobject_to_layer.py
@@ -1,6 +1,6 @@
 """Convert Smart object to artLayer."""
 
-# Import builtin modules
+# Import built-in modules
 from textwrap import dedent
 
 # Import local modules
@@ -10,10 +10,12 @@
 
 # example 1
 with Session() as ps:
-    js = dedent("""
+    js = dedent(
+        """
         var idplacedLayerConvertToLayers = stringIDToTypeID( "placedLayerConvertToLayers" );
         executeAction( idplacedLayerConvertToLayers, undefined, DialogModes.NO );
-    """)
+    """
+    )
     ps.app.doJavaScript(js)
 
 # example 2

diff --git a/examples/emboss_action.py b/examples/emboss_action.py
@@ -2,54 +2,47 @@
 from photoshop import Session
 import photoshop.api.action_manager as am
 
+
 with Session() as ps:
     app = ps.app
     for index, x in enumerate(range(50)):
         # Execute an existing action from action palette.
         exec_dict = {
-            '_classID':None,
-            'null':[
-                '!ref',
-                am.ReferenceKey(desiredclass='action', value='Sepia Toning (layer)'),
-                am.ReferenceKey(desiredclass='actionSet', value='Default Actions')
-            ]
+            "_classID": None,
+            "null": [
+                "!ref",
+                am.ReferenceKey(desiredclass="action", value="Sepia Toning (layer)"),
+                am.ReferenceKey(desiredclass="actionSet", value="Default Actions"),
+            ],
         }
         exec_desc = ps.ActionDescriptor.load(exec_dict)
-        app.executeAction(am.str2id('Ply '), exec_desc, ps.DialogModes.DisplayNoDialogs)
+        app.executeAction(am.str2id("Ply "), exec_desc, ps.DialogModes.DisplayNoDialogs)
 
         # Create solid color fill layer.
         filledlayer_dict = {
-            '_classID':None,
-            'null':[
-                '!ref',
-                am.ReferenceKey(desiredclass='contentLayer',value=None)
-            ],
-            'using':{
-                '_classID':'contentLayer',
-                'type':{
-                    '_classID':'solidColorLayer',
-                    'color':{
-                        '_classID':'RGBColor',
-                        'red':index,
-                        'grain':index,
-                        'blue':index
-                    }
-                }
-            }
+            "_classID": None,
+            "null": ["!ref", am.ReferenceKey(desiredclass="contentLayer", value=None)],
+            "using": {
+                "_classID": "contentLayer",
+                "type": {
+                    "_classID": "solidColorLayer",
+                    "color": {"_classID": "RGBColor", "red": index, "grain": index, "blue": index},  # noqa
+                },
+            },
         }
         filledlayer_desc = ps.ActionDescriptor.load(filledlayer_dict)
-        app.executeAction(am.str2id('Mk  '), filledlayer_desc, ps.DialogModes.DisplayNoDialogs)
+        app.executeAction(am.str2id("Mk  "), filledlayer_desc, ps.DialogModes.DisplayNoDialogs)
 
         # Select mask.
         selectmask_dict = {
-            '_classID':None,
-            'null':[
-                '!ref',
-                am.ReferenceKey(desiredclass='channel', value=am.Enumerated(type='channel',value='mask'))
+            "_classID": None,
+            "null": [
+                "!ref",
+                am.ReferenceKey(desiredclass="channel", value=am.Enumerated(type="channel", value="mask")),
             ],
-            'makeVisible':False
+            "makeVisible": False,
         }
         selectmask_desc = ps.ActionDescriptor.load(selectmask_dict)
-        app.executeAction(am.str2id('slct'), selectmask_desc, ps.DialogModes.DisplayNoDialogs)
+        app.executeAction(am.str2id("slct"), selectmask_desc, ps.DialogModes.DisplayNoDialogs)
 
         app.activeDocument.activeLayer.invert()
diff --git a/examples/import_image_as_layer.py b/examples/import_image_as_layer.py
@@ -1,14 +1,16 @@
 """Import a image as a artLayer."""
 
+# Import built-in modules
+import pathlib
+
 # Import local modules
 from photoshop import Session
-import pathlib
+import photoshop.api.action_manager as am
 
 
 with Session(action="new_document") as ps:
-    import_dict = {
-        '_classID':None,
-        'null':pathlib.Path("your/image/path")  # replace it with your own path here
-    }
+    # replace it with your own path here
+    import_dict = {"_classID": None, "null": pathlib.Path("your/image/path")}
     import_desc = ps.ActionDescriptor.load(import_dict)
-    ps.app.executeAction(am.str2id("Plc "), import_desc)  # `Plc` need one space in here.
+    ps.app.executeAction(am.str2id("Plc "), import_desc)
+    # length of charID should always be 4, if not, pad with spaces
diff --git a/examples/replace_images.py b/examples/replace_images.py
@@ -1,13 +1,14 @@
 """Replace the image of the current active layer with a new image."""
 
-# Import builtin modules
+# Import built-in modules
 import pathlib
 
 # Import third-party modules
 import examples._psd_files as psd  # Import from examples.
 
 # Import local modules
 from photoshop import Session
+import photoshop.api.action_manager as am
 
 
 PSD_FILE = psd.get_psd_files()
@@ -17,10 +18,7 @@
     active_layer = ps.active_document.activeLayer
     bounds = active_layer.bounds
     print(f"current layer {active_layer.name}: {bounds}")
-    input_dict = {
-        '_classID':None,
-        'null':pathlib.Path(PSD_FILE["red_100x200.png"])
-    }
+    input_dict = {"_classID": None, "null": pathlib.Path(PSD_FILE["red_100x200.png"])}
     input_desc = ps.ActionDescriptor.load(input_dict)
     ps.app.executeAction(am.str2id("placedLayerReplaceContents"), input_desc)
 

diff --git a/examples/session_smart_sharpen.py b/examples/session_smart_sharpen.py
@@ -11,6 +11,7 @@
 
 # Import local modules
 from photoshop import Session
+import photoshop.api.action_manager as am
 
 
 PSD_FILE = psd.get_psd_files()
@@ -20,14 +21,14 @@
 
     def SmartSharpen(inAmount, inRadius, inNoise):
         ss_dict = {
-            '_classID':None,
-            'presetKindType':am.Enumerated(type='presetKindType', value='presetKindCustom'),
-            'amount':am.UnitDouble(unit='radius', double=inAmount),
-            'radius':am.UnitDouble(unit='pixelsUnit', double=inRadius),
-            'noiseReduction':am.UnitDouble(unit='percentUnit', double=inNoise),
-            'blur':am.Enumerated(type='blurType', value='gaussianBlur')
+            "_classID": None,
+            "presetKindType": am.Enumerated(type="presetKindType", value="presetKindCustom"),  # noqa
+            "amount": am.UnitDouble(unit="radius", double=inAmount),
+            "radius": am.UnitDouble(unit="pixelsUnit", double=inRadius),
+            "noiseReduction": am.UnitDouble(unit="percentUnit", double=inNoise),
+            "blur": am.Enumerated(type="blurType", value="gaussianBlur"),
         }
         ss_desc = ps.ActionDescriptor.load(ss_dict)
-        app.ExecuteAction(am.str2id('smartSharpen'), ss_desc)
+        ps.app.ExecuteAction(am.str2id("smartSharpen"), ss_desc)
 
-    SmartSharpen(300, 2.0, 20)
+    SmartSharpen(300, 2.0, 20)
diff --git a/examples/smart_sharpen.py b/examples/smart_sharpen.py
@@ -27,14 +27,15 @@
 
 def SmartSharpen(inAmount, inRadius, inNoise):
     ss_dict = {
-        '_classID':None,
-        'presetKindType':am.Enumerated(type='presetKindType', value='presetKindCustom'),
-        'amount':am.UnitDouble(unit='radius', double=inAmount),
-        'radius':am.UnitDouble(unit='pixelsUnit', double=inRadius),
-        'noiseReduction':am.UnitDouble(unit='percentUnit', double=inNoise),
-        'blur':am.Enumerated(type='blurType', value='gaussianBlur')
+        "_classID": None,
+        "presetKindType": am.Enumerated(type="presetKindType", value="presetKindCustom"),  # noqa
+        "amount": am.UnitDouble(unit="radius", double=inAmount),
+        "radius": am.UnitDouble(unit="pixelsUnit", double=inRadius),
+        "noiseReduction": am.UnitDouble(unit="percentUnit", double=inNoise),
+        "blur": am.Enumerated(type="blurType", value="gaussianBlur"),
     }
     ss_desc = ps.ActionDescriptor.load(ss_dict)
-    app.ExecuteAction(am.str2id('smartSharpen'), ss_desc)
+    app.ExecuteAction(am.str2id("smartSharpen"), ss_desc)
 
-SmartSharpen(300, 2.0, 20)
+
+SmartSharpen(300, 2.0, 20)
diff --git a/photoshop/api/_actionmanager_type_binder.py b/photoshop/api/_actionmanager_type_binder.py
@@ -7,19 +7,25 @@
 
 # Import local modules
 from photoshop.api.action_descriptor import ActionDescriptor as AD_proto
-from photoshop.api.action_manager._main_types.action_descriptor import ActionDescriptor as AD_utils_proto
 from photoshop.api.action_list import ActionList as AL_proto
-from photoshop.api.action_manager._main_types.action_list import ActionList as AL_utils_proto
+from photoshop.api.action_manager._main_types.action_descriptor import (
+    ActionDescriptor as AD_utils_proto,
+)
+from photoshop.api.action_manager._main_types.action_list import (
+    ActionList as AL_utils_proto,
+)
+from photoshop.api.action_manager._main_types.action_reference import (
+    ActionReference as AR_utils_proto,
+)
 from photoshop.api.action_reference import ActionReference as AR_proto
-from photoshop.api.action_manager._main_types.action_reference import ActionReference as AR_utils_proto
 from photoshop.api.enumerations import DescValueType
 from photoshop.api.enumerations import ReferenceFormType
 
 
 class ActionDescriptor(AD_proto, AD_utils_proto):
     @classmethod
-    def load(cls, adict: dict) -> 'ActionDescriptor':
-        '''Convert a python object to an ActionDescriptor'''
+    def load(cls, adict: dict) -> "ActionDescriptor":
+        """Convert a python object to an ActionDescriptor"""
         return super().load(adict, globals())
 
     def __init__(self, parent=None, classID=None):
@@ -45,8 +51,8 @@ def getReference(self, key: int) -> "ActionReference":
 
 class ActionList(AL_proto, AL_utils_proto):
     @classmethod
-    def load(cls, alist: list) -> 'ActionList':
-        '''Convert a python object to an ActionList'''
+    def load(cls, alist: list) -> "ActionList":
+        """Convert a python object to an ActionList"""
         return super().load(alist, globals())
 
     def getType(self, index: int) -> DescValueType:
@@ -68,8 +74,8 @@ def getReference(self, index: int) -> "ActionReference":
 
 class ActionReference(AR_proto, AR_utils_proto):
     @classmethod
-    def load(cls, adict: dict) -> 'ActionReference':
-        '''Convert a python object to an ActionReference'''
+    def load(cls, adict: dict) -> "ActionReference":
+        """Convert a python object to an ActionReference"""
         return super().load(adict)
 
     def getForm(self) -> ReferenceFormType:

diff --git a/photoshop/api/action_manager/__init__.py b/photoshop/api/action_manager/__init__.py
@@ -1,20 +1,28 @@
-from .ref_form_types import *
-from .desc_value_types import *
-from .utils import *
+from .desc_value_types import Enumerated
+from .desc_value_types import TypeID
+from .desc_value_types import UnitDouble
+from .jprint import jformat
+from .jprint import jprint
 from .js_converter import dump as dumpjs
-from .jprint import *
+from .ref_form_types import Identifier
+from .ref_form_types import Index
+from .ref_form_types import Offset
+from .ref_form_types import ReferenceKey
+from .utils import id2str
+from .utils import str2id
+
 
 __all__ = [  # noqa: F405
-    'str2id',
-    'id2str',
-    'Enumerated',
-    'TypeID',
-    'UnitDouble',
-    'Identifier',
-    'Index',
-    'Offset',
-    'ReferenceKey',
-    'dumpjs',
-    'jprint',
-    'jformat',
-]
+    "str2id",
+    "id2str",
+    "Enumerated",
+    "TypeID",
+    "UnitDouble",
+    "Identifier",
+    "Index",
+    "Offset",
+    "ReferenceKey",
+    "dumpjs",
+    "jprint",
+    "jformat",
+]