openstack/deb-python-cassandra-driver
Code Issues Proposed changes

log.warn --> log.warning in cqlengine (deprecated)

Browse Source
This commit is contained in:
Adam Holmberg
2015-03-17 12:01:59 -05:00
parent 1df92a9ea5
commit 527df352e5
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cassandra/cqlengine/columns.py
View File

@@ -185,7 +185,7 @@ class Column(object):
if polymorphic_key: if polymorphic_key:
msg = "polymorphic_key is deprecated. Use discriminator_column instead." msg = "polymorphic_key is deprecated. Use discriminator_column instead."
warnings.warn(msg, DeprecationWarning) warnings.warn(msg, DeprecationWarning)
log.warn(msg) log.warning(msg)
self.discriminator_column = discriminator_column or polymorphic_key self.discriminator_column = discriminator_column or polymorphic_key
self.polymorphic_key = self.discriminator_column self.polymorphic_key = self.discriminator_column

6
cassandra/cqlengine/connection.py
View File

@@ -54,7 +54,7 @@ def default():
global cluster, session global cluster, session
if session: if session:
log.warn("configuring new connection for cqlengine when one was already set") log.warning("configuring new connection for cqlengine when one was already set")
cluster = Cluster() cluster = Cluster()
session = cluster.connect() session = cluster.connect()
@@ -75,7 +75,7 @@ def set_session(s):
global cluster, session global cluster, session
if session: if session:
log.warn("configuring new connection for cqlengine when one was already set") log.warning("configuring new connection for cqlengine when one was already set")
if s.row_factory is not dict_factory: if s.row_factory is not dict_factory:
raise CQLEngineException("Failed to initialize: 'Session.row_factory' must be 'dict_factory'.") raise CQLEngineException("Failed to initialize: 'Session.row_factory' must be 'dict_factory'.")
@@ -130,7 +130,7 @@ def setup(
log.debug("cqlengine connection initialized with internally created session") log.debug("cqlengine connection initialized with internally created session")
except NoHostAvailable: except NoHostAvailable:
if retry_connect: if retry_connect:
log.warn("connect failed, setting up for re-attempt on first use") log.warning("connect failed, setting up for re-attempt on first use")
kwargs['default_keyspace'] = default_keyspace kwargs['default_keyspace'] = default_keyspace
kwargs['consistency'] = consistency kwargs['consistency'] = consistency
kwargs['lazy_connect'] = False kwargs['lazy_connect'] = False

6
cassandra/cqlengine/management.py
View File

@@ -61,7 +61,7 @@ def create_keyspace(name, strategy_class, replication_factor, durable_writes=Tru
msg = "Deprecated. Use create_keyspace_simple or create_keyspace_network_topology instead" msg = "Deprecated. Use create_keyspace_simple or create_keyspace_network_topology instead"
warnings.warn(msg, DeprecationWarning) warnings.warn(msg, DeprecationWarning)
log.warn(msg) log.warning(msg)
cluster = get_cluster() cluster = get_cluster()
@@ -143,7 +143,7 @@ def _create_keyspace(name, durable_writes, strategy_class, strategy_options):
def delete_keyspace(name): def delete_keyspace(name):
msg = "Deprecated. Use drop_keyspace instead" msg = "Deprecated. Use drop_keyspace instead"
warnings.warn(msg, DeprecationWarning) warnings.warn(msg, DeprecationWarning)
log.warn(msg) log.warning(msg)
drop_keyspace(name) drop_keyspace(name)
@@ -532,6 +532,6 @@ def _allow_schema_modification():
if not os.getenv(CQLENG_ALLOW_SCHEMA_MANAGEMENT): if not os.getenv(CQLENG_ALLOW_SCHEMA_MANAGEMENT):
msg = CQLENG_ALLOW_SCHEMA_MANAGEMENT + " environment variable is not set. Future versions of this package will require this variable to enable management functions." msg = CQLENG_ALLOW_SCHEMA_MANAGEMENT + " environment variable is not set. Future versions of this package will require this variable to enable management functions."
warnings.warn(msg) warnings.warn(msg)
log.warn(msg) log.warning(msg)
return True return True

2
cassandra/cqlengine/models.py
View File

@@ -773,7 +773,7 @@ class ModelMetaClass(type):
if poly_key: if poly_key:
msg = '__polymorphic_key__ is deprecated. Use __discriminator_value__ instead' msg = '__polymorphic_key__ is deprecated. Use __discriminator_value__ instead'
warnings.warn(msg, DeprecationWarning) warnings.warn(msg, DeprecationWarning)
log.warn(msg) log.warning(msg)
attrs['__discriminator_value__'] = attrs.get('__discriminator_value__', poly_key) attrs['__discriminator_value__'] = attrs.get('__discriminator_value__', poly_key)
attrs['__polymorphic_key__'] = attrs['__discriminator_value__'] attrs['__polymorphic_key__'] = attrs['__discriminator_value__']