From 755572328830be81f4d9fbbd293e2b7ee8ff4a72 Mon Sep 17 00:00:00 2001 From: gengchc2 Date: Tue, 27 Sep 2016 10:51:55 +0800 Subject: [PATCH] Change __metaclass__ with optimal six.add_metaclass Use six.add_metaclass instead of __metaclass__.[1] [1]http://docs.openstack.org/developer/hacking/# Change-Id: I522aa37c58aac1b4b57f356f60ed8ae9467f935b --- solar/dblayer/model.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solar/dblayer/model.py b/solar/dblayer/model.py index f93fb200..d378ebe9 100644 --- a/solar/dblayer/model.py +++ b/solar/dblayer/model.py @@ -21,6 +21,7 @@ import weakref from collections import defaultdict from random import getrandbits +import six from threading import RLock from solar.dblayer.conflict_resolution import dblayer_conflict_resolver @@ -661,10 +662,9 @@ class NestedField(FieldBase): obj.delete() +@six.add_metaclass(ModelMeta) class NestedModel(object): - __metaclass__ = ModelMeta - _nested_value = None def __init__(self, field, parent): @@ -738,9 +738,9 @@ class NestedModelHash(object): self[hk] = data +@six.add_metaclass(ModelMeta) class Model(object): - __metaclass__ = ModelMeta _c = ClassCache()