fix deprecation warnings of 'python -3'

kzk · kzk · commit 4c8762658372 · 2011-10-01T22:49:05.000+09:00
diff --git a/fluent/event.py b/fluent/event.py
@@ -4,5 +4,5 @@ class Event:
     def __init__(self, label, data, **kwargs):
         if not isinstance(data, dict) :
             raise Exception("data must be dict")
-        l = kwargs.has_key("logger") and kwargs['logger'] or logger.get_global_logger()
+        l = ('logger' in kwargs) and kwargs['logger'] or logger.get_global_logger()
         l.emit(label, data)
diff --git a/fluent/logger.py b/fluent/logger.py
@@ -10,8 +10,8 @@
 global_logger = None
 
 def setup(tag, **kwargs):
-    host = kwargs.has_key("host") and kwargs['host'] or 'localhost'
-    port = kwargs.has_key("port") and kwargs['port'] or 24224
+    host = ('host' in kwargs) and kwargs['host'] or 'localhost'
+    port = ('port' in kwargs) and kwargs['port'] or 24224
 
     global global_logger
     global_logger = FluentLogger(tag, host=host, port=port)
