Skip to content

Commit 3267d20

Browse files
TsXorTsXor
committed
fix(action_manager): hop
Signed-off-by: TsXor <[email protected]>
1 parent 3a9cd2b commit 3267d20

File tree

3 files changed

+22
-64
lines changed

3 files changed

+22
-64
lines changed

‎photoshop/api/action_manager/_main_types/action_descriptor.py

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ def load(cls, adict: dict, namespace: dict): # pass globals() for namespace
2424
continue
2525
# py37 compat
2626
try:
27-
exec(
28-
"""val = v if (dtype := parsetype(v)) == "others" else namespace[dtype].load(v)"""
29-
)
27+
exec("""val = v if (dtype := parsetype(v)) == "others" else namespace[dtype].load(v)""")
3028
except SyntaxError:
3129
val = v if parsetype(v) == "others" else namespace[parsetype(v)].load(v)
3230
new.uput(k, val)
@@ -61,26 +59,15 @@ def dump(self) -> dict:
6159
ddict = {"_classID": self.classID}
6260
# py37 compat
6361
try:
64-
exec(
65-
"""ext = {key: (value.dump() if hasattr(value := self.uget(key), "dump") else value) for key in self}"""
66-
)
62+
exec(r'ext = {key: (value.dump() if hasattr(value := self.uget(key), "dump") else value) for key in self}')
6763
except SyntaxError:
68-
ext = {
69-
key: (
70-
self.uget(key).dump()
71-
if hasattr(self.uget(key), "dump")
72-
else self.uget(key)
73-
)
74-
for key in self
75-
}
64+
ext = {key: (self.uget(key).dump() if hasattr(self.uget(key), "dump") else self.uget(key)) for key in self}
7665
ddict.update(ext)
7766
return ddict
7867

7968
def _unpacker(self) -> tuple:
8069
value = self
8170
if self.classID is None:
82-
raise RuntimeError(
83-
"Do not use old methods and new methods mixedly."
84-
)
71+
raise RuntimeError("Do not use old methods and new methods mixedly.")
8572
clsid = str2id(self.classID)
8673
return (clsid, value)

‎photoshop/api/action_manager/_main_types/action_list.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ def load(cls, alist: list, namespace: dict): # pass globals() for namespace
2020
for v in alist:
2121
# py37 compat
2222
try:
23-
exec(
24-
"""val = v if (dtype := parsetype(v)) == "others" else namespace[dtype].load(v)"""
25-
)
23+
exec("""val = v if (dtype := parsetype(v)) == "others" else namespace[dtype].load(v)""")
2624
except SyntaxError:
2725
val = v if parsetype(v) == "others" else namespace[parsetype(v)].load(v)
2826
new.uput(val)
@@ -48,9 +46,9 @@ def uput(self, val: Any):
4846
# py37 compat
4947
try:
5048
exec(
51-
'''assert True if (dtype := self.dtype) is None ''' +
52-
'''else dtype == typestr, ''' +
53-
'''"ActionList can only hold things of the same type"'''
49+
"""assert ("""
50+
+ """True if (dtype := self.dtype) is None else dtype == typestr, """
51+
+ '''), "ActionList can only hold things of the same type"'''
5452
)
5553
except SyntaxError:
5654
assert (
@@ -68,7 +66,5 @@ def __iter__(self) -> ActionList_Iterator:
6866
def dump(self) -> list:
6967
"""Convert an ActionList to a python object."""
7068
# This is a list comprehension.
71-
dlist = [
72-
(elem.dump() if hasattr(elem, "dump") else elem) for elem in self
73-
]
69+
dlist = [(elem.dump() if hasattr(elem, "dump") else elem) for elem in self]
7470
return dlist

‎photoshop/api/action_manager/js_converter/convert.py

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -50,27 +50,15 @@ def unhead(string):
5050
"ActionList": lambda x: parselist(x),
5151
}
5252
str2refgetpacker = {
53-
"default": lambda x: ReferenceKey(
54-
unhead(x["DesiredClass"]), unhead(x["Value"])
55-
),
53+
"default": lambda x: ReferenceKey(unhead(x["DesiredClass"]), unhead(x["Value"])),
5654
"Enumerated": lambda x: ReferenceKey(
5755
unhead(x["DesiredClass"]),
58-
Enumerated(
59-
unhead(x["Value"]["enumtype"]), unhead(x["Value"]["enumval"])
60-
), # noqa
61-
),
62-
"Identifier": lambda x: ReferenceKey(
63-
unhead(x["DesiredClass"]), Identifier + int(x["Value"])
64-
),
65-
"Index": lambda x: ReferenceKey(
66-
unhead(x["DesiredClass"]), Index + int(x["Value"])
67-
),
68-
"Offset": lambda x: ReferenceKey(
69-
unhead(x["DesiredClass"]), Offset + int(x["Value"])
70-
),
71-
"Property": lambda x: ReferenceKey(
72-
unhead(x["DesiredClass"]), toid(x["Value"])
56+
Enumerated(unhead(x["Value"]["enumtype"]), unhead(x["Value"]["enumval"])), # noqa
7357
),
58+
"Identifier": lambda x: ReferenceKey(unhead(x["DesiredClass"]), Identifier + int(x["Value"])),
59+
"Index": lambda x: ReferenceKey(unhead(x["DesiredClass"]), Index + int(x["Value"])),
60+
"Offset": lambda x: ReferenceKey(unhead(x["DesiredClass"]), Offset + int(x["Value"])),
61+
"Property": lambda x: ReferenceKey(unhead(x["DesiredClass"]), toid(x["Value"])),
7462
}
7563

7664

@@ -79,19 +67,14 @@ def parsedict(tdict):
7967
tdict["_classID"] = None
8068
else:
8169
tdict["_classID"] = unhead(tdict["_classID"])
82-
pdict = {
83-
unhead(k): (str2getpacker[v["type"]](v) if type(v) == dict else v)
84-
for k, v in tdict.items()
85-
}
70+
pdict = {unhead(k): (str2getpacker[v["type"]](v) if type(v) == dict else v) for k, v in tdict.items()}
8671
del pdict["type"]
8772
return pdict
8873

8974

9075
def parselist(tdict):
9176
d2l = [tdict[str(i)] for i in range(tdict["len"])]
92-
plist = [
93-
(str2getpacker[e["type"]](e) if type(e) == dict else e) for e in d2l
94-
]
77+
plist = [(str2getpacker[e["type"]](e) if type(e) == dict else e) for e in d2l]
9578
return plist
9679

9780

@@ -101,17 +84,13 @@ def parseref(tdict):
10184
# py37 compat
10285
try:
10386
exec(
104-
"""ext = [(str2refgetpacker[val["type"]](e) """ +
105-
"""if type(val := e["Value"]) == dict """ +
106-
"""else str2refgetpacker["default"](e)) for e in d2l]"""
87+
"""ext = [(str2refgetpacker[val["type"]](e) """
88+
+ """if type(val := e["Value"]) == dict """
89+
+ """else str2refgetpacker["default"](e)) for e in d2l]"""
10790
)
10891
except SyntaxError:
10992
ext = [
110-
(
111-
str2refgetpacker[e["Value"]["type"]](e)
112-
if type(e["Value"]) == dict
113-
else str2refgetpacker["default"](e)
114-
)
93+
(str2refgetpacker[e["Value"]["type"]](e) if type(e["Value"]) == dict else str2refgetpacker["default"](e))
11594
for e in d2l
11695
]
11796
plist.extend(ext)
@@ -120,11 +99,7 @@ def parseref(tdict):
12099

121100
def json2obj(jsont):
122101
obj_init = json.loads(jsont)
123-
obj_desc = (
124-
parsedict(obj_init["ActionDescriptor"])
125-
if "ActionDescriptor" in obj_init
126-
else None
127-
)
102+
obj_desc = parsedict(obj_init["ActionDescriptor"]) if "ActionDescriptor" in obj_init else None
128103
obj_operation = unhead(obj_init["Operation"])
129104
obj_option = obj_init["Option"]
130105
return (obj_operation, obj_desc, obj_option)

0 commit comments

Comments
 (0)