Merge pull request #2704 from aiordache/cleanup

Fix condition to avoid syntax warning

Author: aiordache

docker/types/containers.py

@@ -334,15 +334,11 @@ def __init__(self, version, binds=None, port_bindings=None,
         if dns_search:
             self['DnsSearch'] = dns_search
 
-        if network_mode is 'host' and port_bindings:
+        if network_mode == 'host' and port_bindings:
             raise host_config_incompatible_error(
                 'network_mode', 'host', 'port_bindings'
             )
-
-        if network_mode:
-            self['NetworkMode'] = network_mode
-        elif network_mode is None:
-            self['NetworkMode'] = 'default'
+        self['NetworkMode'] = network_mode or 'default'
 
         if restart_policy:
             if not isinstance(restart_policy, dict):