Codebase list glance / 9d42252
Leverage dict comprehension in PEP-0274 PEP-0274 introduced dict comprehensions to replace dict constructor with a sequence of key-pairs[1], these are two benefits: - First, it makes the code look neater. - Second, it gains a micro-optimization. Glance dropped python 2.6 support in Kilo, we can leverage this now. Note: This commit doesn't handle dict constructor with kwargs. This commit also adds a hacking rule. [1]http://legacy.python.org/dev/peps/pep-0274/ Co-Authored-By: ChangBo Guo(gcb) <eric.guo@easystack.cn> Co-Authored-By: Kamil Rykowski <kamil.rykowski@intel.com> Change-Id: I0ba408f9c616dcdb09618f6256db76b9facc0c1d ChangBo Guo(gcb) authored 9 years ago ChangBo Guo(gcb) committed 8 years ago
11 changed file(s) with 54 addition(s) and 20 deletion(s). Raw diff Collapse all Expand all
+2
-1
HACKING.rst less more
2121 - [G324] Validate that LOG.error messages use _LE.
2222 - [G325] Validate that LOG.critical messages use _LC.
2323 - [G326] Validate that LOG.warning messages use _LW.
24 - [G327] Prevent use of deprecated contextlib.nested⏎
24 - [G327] Prevent use of deprecated contextlib.nested
25 - [G328] Must use a dict comprehension instead of a dict constructor with a sequence of key-value pairs
+1
-2
glance/common/client.py less more
412412 names and values
413413 """
414414 to_str = encodeutils.safe_encode
415 return dict([(to_str(h), to_str(v)) for h, v in
416 six.iteritems(headers)])
415 return {to_str(h): to_str(v) for h, v in six.iteritems(headers)}
417416
418417 @handle_redirects
419418 def _do_request(self, method, url, body, headers):
+1
-1
glance/db/sqlalchemy/api.py less more
453453 tag_filters.extend([models.ImageTag.value == tag])
454454 tag_conditions.append(tag_filters)
455455
456 filters = dict([(k, v) for k, v in filters.items() if v is not None])
456 filters = {k: v for k, v in filters.items() if v is not None}
457457
458458 for (k, v) in filters.items():
459459 key = k
+9
-0
glance/hacking/checks.py less more
5454 r"(.)*LOG\.(critical)\(\s*(_\(|'|\")")
5555 log_translation_warning = re.compile(
5656 r"(.)*LOG\.(warning)\(\s*(_\(|'|\")")
57 dict_constructor_with_list_copy_re = re.compile(r".*\bdict\((\[)?(\(|\[)")
5758
5859
5960 def assert_true_instance(logical_line):
147148 yield(0, msg)
148149
149150
151 def dict_constructor_with_list_copy(logical_line):
152 msg = ("G328: Must use a dict comprehension instead of a dict constructor "
153 "with a sequence of key-value pairs.")
154 if dict_constructor_with_list_copy_re.match(logical_line):
155 yield (0, msg)
156
157
150158 def factory(register):
151159 register(assert_true_instance)
152160 register(assert_equal_type)
155163 register(no_direct_use_of_unicode_function)
156164 register(validate_log_translations)
157165 register(check_no_contextlib_nested)
166 register(dict_constructor_with_list_copy)
+1
-2
glance/image_cache/drivers/sqlite.py less more
8282
8383
8484 def dict_factory(cur, row):
85 return dict(
86 ((col[0], row[idx]) for idx, col in enumerate(cur.description)))
85 return {col[0]: row[idx] for idx, col in enumerate(cur.description)}
8786
8887
8988 class Driver(base.Driver):
+5
-6
glance/registry/api/v1/images.py less more
465465 try:
466466 LOG.debug("Updating image %(id)s with metadata: %(image_data)r",
467467 {'id': id,
468 'image_data': dict((k, v) for k, v in image_data.items()
469 if k != 'locations')})
468 'image_data': {k: v for k, v in image_data.items()
469 if k != 'locations'}})
470470 image_data = _normalize_image_location_for_db(image_data)
471471 if purge_props == "true":
472472 purge_props = True
531531 """
532532
533533 def _fetch_attrs(d, attrs):
534 return dict([(a, d[a]) for a in attrs
535 if a in d.keys()])
534 return {a: d[a] for a in attrs if a in d.keys()}
536535
537536 # TODO(sirp): should this be a dict, or a list of dicts?
538537 # A plain dict is more convenient, but list of dicts would provide
539538 # access to created_at, etc
540 properties = dict((p['name'], p['value'])
541 for p in image['properties'] if not p['deleted'])
539 properties = {p['name']: p['value'] for p in image['properties']
540 if not p['deleted']}
542541
543542 image_dict = _fetch_attrs(image, glance.db.IMAGE_ATTRS)
544543 image_dict['properties'] = properties
+1
-2
glance/registry/api/v1/members.py less more
355355 """
356356
357357 def _fetch_memb(memb, attr_map):
358 return dict([(k, memb[v])
359 for k, v in attr_map.items() if v in memb.keys()])
358 return {k: memb[v] for k, v in attr_map.items() if v in memb.keys()}
360359
361360 # Return the list of members with the given attribute mapping
362361 return [_fetch_memb(memb, attr_map) for memb in members]
+2
-2
glance/tests/functional/db/base.py less more
286286 fixture = {'properties': {'ping': 'pong'}}
287287 image = self.db_api.image_update(self.adm_context, UUID1, fixture)
288288 expected = {'ping': 'pong', 'foo': 'bar', 'far': 'boo'}
289 actual = dict((p['name'], p['value']) for p in image['properties'])
289 actual = {p['name']: p['value'] for p in image['properties']}
290290 self.assertEqual(expected, actual)
291291 self.assertNotEqual(image['created_at'], image['updated_at'])
292292
294294 fixture = {'properties': {'ping': 'pong'}}
295295 image = self.db_api.image_update(self.adm_context, UUID1,
296296 fixture, purge_props=True)
297 properties = dict((p['name'], p) for p in image['properties'])
297 properties = {p['name']: p for p in image['properties']}
298298
299299 # New properties are set
300300 self.assertTrue('ping' in properties)
+28
-0
glance/tests/test_hacking.py less more
7171
7272 self.assertEqual(0, len(list(checks.check_no_contextlib_nested(
7373 "with foo as bar"))))
74
75 def test_dict_constructor_with_list_copy(self):
76 self.assertEqual(1, len(list(checks.dict_constructor_with_list_copy(
77 " dict([(i, connect_info[i])"))))
78
79 self.assertEqual(1, len(list(checks.dict_constructor_with_list_copy(
80 " attrs = dict([(k, _from_json(v))"))))
81
82 self.assertEqual(1, len(list(checks.dict_constructor_with_list_copy(
83 " type_names = dict((value, key) for key, value in"))))
84
85 self.assertEqual(1, len(list(checks.dict_constructor_with_list_copy(
86 " dict((value, key) for key, value in"))))
87
88 self.assertEqual(1, len(list(checks.dict_constructor_with_list_copy(
89 "foo(param=dict((k, v) for k, v in bar.items()))"))))
90
91 self.assertEqual(1, len(list(checks.dict_constructor_with_list_copy(
92 " dict([[i,i] for i in range(3)])"))))
93
94 self.assertEqual(1, len(list(checks.dict_constructor_with_list_copy(
95 " dd = dict([i,i] for i in range(3))"))))
96
97 self.assertEqual(0, len(list(checks.dict_constructor_with_list_copy(
98 " create_kwargs = dict(snapshot=snapshot,"))))
99
100 self.assertEqual(0, len(list(checks.dict_constructor_with_list_copy(
101 " self._render_dict(xml, data_el, data.__dict__)"))))
+3
-3
glance/tests/unit/test_migrations.py less more
275275 return initial_values
276276
277277 def _check_010(self, engine, data):
278 values = dict((c, u) for c, u in data)
278 values = {c: u for c, u in data}
279279
280280 images = db_utils.get_table(engine, 'images')
281281 for row in images.select().execute():
645645 def _check_019(self, engine, data):
646646 image_locations = db_utils.get_table(engine, 'image_locations')
647647 records = image_locations.select().execute().fetchall()
648 locations = dict([(il.image_id, il.value) for il in records])
648 locations = {il.image_id: il.value for il in records}
649649 self.assertEqual('http://glance.example.com',
650650 locations.get('fake-19-1'))
651651
936936 records = tasks_table.select().execute().fetchall()
937937 self.assertEqual(2, len(records))
938938
939 tasks = dict([(t.id, t) for t in records])
939 tasks = {t.id: t for t in records}
940940
941941 task_1 = tasks.get('task-1')
942942 self.assertEqual('some input', task_1.input)
+1
-1
tools/migrate_image_owners.py less more
3939 else:
4040 entities = ksclient.users.list()
4141 # build mapping of (user or tenant) name to id
42 return dict([(entity.name, entity.id) for entity in entities])
42 return {entity.name: entity.id for entity in entities}
4343
4444
4545 def build_image_owner_map(owner_map, db, context):