1.1 --- a/imiptools/client.py Tue Oct 17 17:16:36 2017 +0200
1.2 +++ b/imiptools/client.py Tue Oct 17 22:24:09 2017 +0200
1.3 @@ -53,14 +53,16 @@
1.4
1.5 self.user = user
1.6 self.messenger = messenger
1.7 - self.store = store or get_store(settings["STORE_TYPE"], settings["STORE_DIR"])
1.8 - self.journal = journal or get_journal(settings["STORE_TYPE"], settings["JOURNAL_DIR"])
1.9 +
1.10 + # The store is mandatory and will be initialised using defaults if not
1.11 + # provided.
1.12
1.13 - try:
1.14 - self.publisher = publisher or get_publisher(settings["PUBLISH_DIR"])
1.15 - except OSError:
1.16 - self.publisher = None
1.17 + self.store = store or get_store()
1.18
1.19 + # Journal and publisher objects are optional.
1.20 +
1.21 + self.journal = journal
1.22 + self.publisher = publisher
1.23 self.preferences_dir = preferences_dir
1.24 self.preferences = None
1.25