From 9bedd5f892257b5fff6422a61f7f7ecd112c1c3b Mon Sep 17 00:00:00 2001
From: Nicolas Jouanin <nico@beerfactory.org>
Date: Tue, 7 Jul 2015 22:41:18 +0200
Subject: [PATCH] Fix None if not config given (fall back to defaults)

---
 hbmqtt/{broker => _old_broker}/__init__.py          | 0
 hbmqtt/{broker => _old_broker}/_broker.py           | 0
 hbmqtt/{broker => _old_broker}/errors.py            | 0
 hbmqtt/{broker => _old_broker}/handlers/__init__.py | 0
 hbmqtt/{broker => _old_broker}/handlers/abstract.py | 0
 hbmqtt/{broker => _old_broker}/handlers/connect.py  | 0
 hbmqtt/client.py                                    | 3 ++-
 samples/broker_start.py                             | 0
 8 files changed, 2 insertions(+), 1 deletion(-)
 rename hbmqtt/{broker => _old_broker}/__init__.py (100%)
 rename hbmqtt/{broker => _old_broker}/_broker.py (100%)
 rename hbmqtt/{broker => _old_broker}/errors.py (100%)
 rename hbmqtt/{broker => _old_broker}/handlers/__init__.py (100%)
 rename hbmqtt/{broker => _old_broker}/handlers/abstract.py (100%)
 rename hbmqtt/{broker => _old_broker}/handlers/connect.py (100%)
 create mode 100644 samples/broker_start.py

diff --git a/hbmqtt/broker/__init__.py b/hbmqtt/_old_broker/__init__.py
similarity index 100%
rename from hbmqtt/broker/__init__.py
rename to hbmqtt/_old_broker/__init__.py
diff --git a/hbmqtt/broker/_broker.py b/hbmqtt/_old_broker/_broker.py
similarity index 100%
rename from hbmqtt/broker/_broker.py
rename to hbmqtt/_old_broker/_broker.py
diff --git a/hbmqtt/broker/errors.py b/hbmqtt/_old_broker/errors.py
similarity index 100%
rename from hbmqtt/broker/errors.py
rename to hbmqtt/_old_broker/errors.py
diff --git a/hbmqtt/broker/handlers/__init__.py b/hbmqtt/_old_broker/handlers/__init__.py
similarity index 100%
rename from hbmqtt/broker/handlers/__init__.py
rename to hbmqtt/_old_broker/handlers/__init__.py
diff --git a/hbmqtt/broker/handlers/abstract.py b/hbmqtt/_old_broker/handlers/abstract.py
similarity index 100%
rename from hbmqtt/broker/handlers/abstract.py
rename to hbmqtt/_old_broker/handlers/abstract.py
diff --git a/hbmqtt/broker/handlers/connect.py b/hbmqtt/_old_broker/handlers/connect.py
similarity index 100%
rename from hbmqtt/broker/handlers/connect.py
rename to hbmqtt/_old_broker/handlers/connect.py
diff --git a/hbmqtt/client.py b/hbmqtt/client.py
index 12db7d5..28020d9 100644
--- a/hbmqtt/client.py
+++ b/hbmqtt/client.py
@@ -65,7 +65,8 @@ class MQTTClient:
         """
         self.logger = logging.getLogger(__name__)
         self.config = _defaults
-        self.config.update(config)
+        if config is not None:
+            self.config.update(config)
         if client_id is not None:
             self.client_id = client_id
         else:
diff --git a/samples/broker_start.py b/samples/broker_start.py
new file mode 100644
index 0000000..e69de29