Skip to content

Commit ae70d90

Browse files
committed
Unify quote style from single quotes to double quotes (only in tools)
1 parent 9bc098e commit ae70d90

File tree

14 files changed

+98
-98
lines changed

14 files changed

+98
-98
lines changed

avalon/tools/creator/app.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ def __init__(self, parent=None):
139139
create_btn.setEnabled(False)
140140

141141
def _on_state_changed(self, state):
142-
self.state['valid'] = state
143-
self.data['Create Button'].setEnabled(state)
142+
self.state["valid"] = state
143+
self.data["Create Button"].setEnabled(state)
144144

145145
def _build_menu(self, default_names):
146146
"""Create optional predefined subset names
@@ -311,7 +311,7 @@ def refresh(self):
311311
def on_create(self):
312312

313313
# Do not allow creation in an invalid state
314-
if not self.state['valid']:
314+
if not self.state["valid"]:
315315
return
316316

317317
asset = self.data["Asset"]

avalon/tools/delegates.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ def setEditorData(self, editor, index):
5050

5151
# Add all available versions to the editor
5252
item = index.data(TreeModel.ItemRole)
53-
parent_id = item['version_document']['parent']
53+
parent_id = item["version_document"]["parent"]
5454
versions = io.find({"type": "version", "parent": parent_id},
5555
sort=[("name", 1)])
5656
index = 0
5757
for i, version in enumerate(versions):
58-
label = self._format_version(version['name'])
58+
label = self._format_version(version["name"])
5959
editor.addItem(label, userData=version)
6060

61-
if version['name'] == value:
61+
if version["name"] == value:
6262
index = i
6363

6464
editor.setCurrentIndex(index) # Will trigger index-change signal
@@ -68,4 +68,4 @@ def setEditorData(self, editor, index):
6868
def setModelData(self, editor, model, index):
6969
"""Apply the integer version back in the model"""
7070
version = editor.itemData(editor.currentIndex())
71-
model.setData(index, version['name'])
71+
model.setData(index, version["name"])

avalon/tools/lib.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ def refresh_family_config_cache():
256256
projection={"config.families": True})
257257

258258
assert project, "Project not found!"
259-
families = project['config'].get("families", [])
260-
families = {family['name']: family for family in families}
259+
families = project["config"].get("families", [])
260+
families = {family["name"]: family for family in families}
261261

262262
# Check if any family state are being overwritten by the configuration
263263
default_state = api.data.get("familiesStateDefault", True)
@@ -269,10 +269,10 @@ def refresh_family_config_cache():
269269
# Set family icon
270270
icon = family.get("icon", None)
271271
if icon:
272-
family['icon'] = qtawesome.icon("fa.{}".format(icon),
272+
family["icon"] = qtawesome.icon("fa.{}".format(icon),
273273
color=FAMILY_ICON_COLOR)
274274
else:
275-
family['icon'] = default_icon
275+
family["icon"] = default_icon
276276

277277
# Update state
278278
state = not default_state if name in toggled else default_state

avalon/tools/loader/app.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ def _assetschanged(self):
180180
return
181181

182182
document = asset_item.data(DocumentRole)
183-
subsets_model.set_asset(document['_id'])
183+
subsets_model.set_asset(document["_id"])
184184

185185
# Clear the version information on asset change
186-
self.data['model']['version'].set_version(None)
186+
self.data["model"]["version"].set_version(None)
187187

188188
self.data["state"]["context"]["asset"] = document["name"]
189189
self.data["state"]["context"]["assetId"] = document["_id"]
@@ -204,9 +204,9 @@ def _versionschanged(self):
204204
if active in rows:
205205
node = active.data(subsets.model.ItemRole)
206206
if node is not None and not node.get("isGroup"):
207-
version = node['version_document']['_id']
207+
version = node["version_document"]["_id"]
208208

209-
self.data['model']['version'].set_version(version)
209+
self.data["model"]["version"].set_version(version)
210210

211211
def _set_context(self, context, refresh=True):
212212
"""Set the selection in the interface using a context.
@@ -243,7 +243,7 @@ def _set_context(self, context, refresh=True):
243243
# scheduled refresh and the silo tabs are not shown.
244244
self._refresh()
245245

246-
asset_widget = self.data['model']['assets']
246+
asset_widget = self.data["model"]["assets"]
247247
asset_widget.set_silo(silo)
248248
asset_widget.select_assets([asset], expand=True)
249249

@@ -441,8 +441,8 @@ def show(debug=False, parent=None, use_context=False):
441441
window.show()
442442

443443
if use_context:
444-
context = {"asset": api.Session['AVALON_ASSET'],
445-
"silo": api.Session['AVALON_SILO']}
444+
context = {"asset": api.Session["AVALON_ASSET"],
445+
"silo": api.Session["AVALON_SILO"]}
446446
window.set_context(context, refresh=True)
447447
else:
448448
window.refresh()

avalon/tools/loader/delegates.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def pretty_date(t, now=None, strftime="%b %d %Y %H:%M"):
3434

3535
# future (consider as just now)
3636
if day_diff < 0:
37-
return 'just now'
37+
return "just now"
3838

3939
# history
4040
if day_diff == 0:

avalon/tools/loader/model.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def set_version(self, index, version):
7474
return
7575

7676
item = index.internalPointer()
77-
assert version['parent'] == item['_id'], ("Version does not "
77+
assert version["parent"] == item["_id"], ("Version does not "
7878
"belong to subset")
7979

8080
# Get the data from the version
@@ -102,8 +102,8 @@ def set_version(self, index, version):
102102
if frame_start is not None and frame_end is not None:
103103
# Remove superfluous zeros from numbers (3.0 -> 3) to improve
104104
# readability for most frame ranges
105-
start_clean = ('%f' % frame_start).rstrip('0').rstrip('.')
106-
end_clean = ('%f' % frame_end).rstrip('0').rstrip('.')
105+
start_clean = ("%f" % frame_start).rstrip("0").rstrip(".")
106+
end_clean = ("%f" % frame_end).rstrip("0").rstrip(".")
107107
frames = "{0}-{1}".format(start_clean, end_clean)
108108
duration = frame_end - frame_start + 1
109109
else:
@@ -115,13 +115,13 @@ def set_version(self, index, version):
115115
family_config = tools_lib.get_family_cached_config(family)
116116

117117
item.update({
118-
"version": version['name'],
118+
"version": version["name"],
119119
"version_document": version,
120120
"author": version_data.get("author", None),
121121
"time": version_data.get("time", None),
122122
"family": family,
123123
"familyLabel": family_config.get("label", family),
124-
"familyIcon": family_config.get('icon', None),
124+
"familyIcon": family_config.get("icon", None),
125125
"families": set(families),
126126
"frameStart": frame_start,
127127
"frameEnd": frame_end,

avalon/tools/loader/widgets.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,13 @@ def on_context_menu(self, point):
141141
available_loaders = api.discover(api.Loader)
142142
loaders = list()
143143

144-
version_id = node['version_document']['_id']
144+
version_id = node["version_document"]["_id"]
145145
representations = io.find({"type": "representation",
146146
"parent": version_id})
147147
for representation in representations:
148148
for loader in api.loaders_from_representation(
149149
available_loaders,
150-
representation['_id']
150+
representation["_id"]
151151
):
152152
loaders.append((representation, loader))
153153

@@ -171,7 +171,7 @@ def sorter(value):
171171
label = loader.__name__
172172

173173
# Add the representation as suffix
174-
label = "{0} ({1})".format(label, representation['name'])
174+
label = "{0} ({1})".format(label, representation["name"])
175175

176176
action = QtWidgets.QAction(label, menu)
177177
action.setData((representation, loader))
@@ -204,7 +204,7 @@ def sorter(value):
204204

205205
# Find the representation name and loader to trigger
206206
action_representation, loader = action.data()
207-
representation_name = action_representation['name'] # extension
207+
representation_name = action_representation["name"] # extension
208208

209209
# Run the loader for all selected indices, for those that have the
210210
# same representation available
@@ -320,26 +320,26 @@ def set_version(self, version_id):
320320
version = io.find_one({"_id": version_id, "type": "version"})
321321
assert version, "Not a valid version id"
322322

323-
subset = io.find_one({"_id": version['parent'], "type": "subset"})
323+
subset = io.find_one({"_id": version["parent"], "type": "subset"})
324324
assert subset, "No valid subset parent for version"
325325

326326
# Define readable creation timestamp
327327
created = version["data"]["time"]
328328
created = datetime.datetime.strptime(created, "%Y%m%dT%H%M%SZ")
329329
created = datetime.datetime.strftime(created, "%b %d %Y %H:%M")
330330

331-
comment = version['data'].get("comment", None) or "No comment"
331+
comment = version["data"].get("comment", None) or "No comment"
332332

333-
source = version['data'].get("source", None)
333+
source = version["data"].get("source", None)
334334
source_label = source if source else "No source"
335335

336336
# Store source and raw data
337-
self.data['source'] = source
338-
self.data['raw'] = version
337+
self.data["source"] = source
338+
self.data["raw"] = version
339339

340340
data = {
341-
"subset": subset['name'],
342-
"version": version['name'],
341+
"subset": subset["name"],
342+
"version": version["name"],
343343
"comment": comment,
344344
"created": created,
345345
"source": source_label

avalon/tools/models.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def __init__(self):
203203
def _get_task_icons(self):
204204
# Get the project configured icons from database
205205
project = io.find_one({"type": "project"})
206-
tasks = project['config'].get('tasks', [])
206+
tasks = project["config"].get("tasks", [])
207207
for task in tasks:
208208
icon_name = task.get("icon", None)
209209
if icon_name:
@@ -280,7 +280,7 @@ def data(self, index, role):
280280
# Add icon to the first column
281281
if role == QtCore.Qt.DecorationRole:
282282
if index.column() == 0:
283-
return index.internalPointer()['icon']
283+
return index.internalPointer()["icon"]
284284

285285
return super(TasksModel, self).data(index, role)
286286

@@ -326,30 +326,30 @@ def _add_hierarchy(self, parent=None):
326326
if parent is None:
327327
# if not a parent find all that are parented to the project
328328
# or do *not* have a visualParent field at all
329-
find_data['$or'] = [
330-
{'data.visualParent': {'$exists': False}},
331-
{'data.visualParent': None}
329+
find_data["$or"] = [
330+
{"data.visualParent": {"$exists": False}},
331+
{"data.visualParent": None}
332332
]
333333
else:
334-
find_data["data.visualParent"] = parent['_id']
334+
find_data["data.visualParent"] = parent["_id"]
335335

336-
assets = io.find(find_data).sort('name', 1)
336+
assets = io.find(find_data).sort("name", 1)
337337

338338
for asset in assets:
339339

340340
# get label from data, otherwise use name
341341
data = asset.get("data", {})
342-
label = data.get("label", asset['name'])
342+
label = data.get("label", asset["name"])
343343
tags = data.get("tags", [])
344344

345345
# store for the asset for optimization
346346
deprecated = "deprecated" in tags
347347

348348
item = Item({
349-
"_id": asset['_id'],
349+
"_id": asset["_id"],
350350
"name": asset["name"],
351351
"label": label,
352-
"type": asset['type'],
352+
"type": asset["type"],
353353
"tags": ", ".join(tags),
354354
"deprecated": deprecated,
355355
"_document": asset

avalon/tools/projectmanager/app.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def _on_asset_created(data):
134134
# This is to allow quick continuing of typing a new asset name
135135
# whenever the user created one; this way we can press the "ENTER"
136136
# key to add an asset and continue typing for the next.
137-
dialog.data['label']['label'].setFocus()
137+
dialog.data["label"]["label"].setFocus()
138138

139139
def _on_current_asset_changed():
140140
"""Callback on current asset changed in item widget.
@@ -184,7 +184,7 @@ def on_add_task(self):
184184
asset_tasks.append(task)
185185

186186
# Update the field
187-
asset['data']['tasks'] = asset_tasks
187+
asset["data"]["tasks"] = asset_tasks
188188

189189
schema.validate(asset)
190190
io.replace_one(_filter, asset)
@@ -203,7 +203,7 @@ def on_asset_changed(self):
203203

204204
model = self.data["model"]["assets"]
205205
selected = model.get_selected_assets()
206-
self.data['model']['tasks'].set_assets(selected)
206+
self.data["model"]["tasks"].set_assets(selected)
207207

208208
def on_silo_changed(self, silo):
209209
"""Callback on asset silo changed"""

avalon/tools/projectmanager/dialogs.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def set_parent(self, parent_id):
122122
if parent_id:
123123
parent_asset = io.find_one({"_id": parent_id, "type": "asset"})
124124
assert parent_asset, "Parent asset does not exist."
125-
parent_name = parent_asset['name']
125+
parent_name = parent_asset["name"]
126126

127127
self.parent_name = parent_name
128128
self.parent_id = parent_id
@@ -131,7 +131,7 @@ def set_parent(self, parent_id):
131131
self.parent_name = ""
132132
self.parent_id = None
133133

134-
self.data['label']['parent'].setText(parent_name)
134+
self.data["label"]["parent"].setText(parent_name)
135135

136136
def update_name(self):
137137
"""Force an update on the long name.
@@ -141,20 +141,20 @@ def update_name(self):
141141
142142
"""
143143

144-
label = self.data['label']['label'].text()
144+
label = self.data["label"]["label"].text()
145145
name = label
146146

147147
# Prefix with parent name (if parent)
148148
if self.parent_name:
149149
name = self.parent_name + "_" + name
150150

151-
self.data['label']['name'].setText(name)
151+
self.data["label"]["name"].setText(name)
152152

153153
def on_add_asset(self):
154154

155155
parent_id = self.parent_id
156-
name = self.data['label']['name'].text()
157-
label = self.data['label']['label'].text()
156+
name = self.data["label"]["name"].text()
157+
label = self.data["label"]["label"].text()
158158
silo = self.silo
159159

160160
if not label:
@@ -184,8 +184,8 @@ def on_add_asset(self):
184184
if parent_id:
185185
parent = io.find_one({"_id": io.ObjectId(parent_id)})
186186
if parent:
187-
group = parent['name']
188-
data['group'] = group
187+
group = parent["name"]
188+
data["group"] = group
189189

190190
try:
191191
lib.create_asset(data)

0 commit comments

Comments
 (0)