From f03f33e48add83a1e6123515ddef196e20c83f6c Mon Sep 17 00:00:00 2001
From: Oliver Sherouse <oliver@oliversherouse.com>
Date: Tue, 17 Apr 2018 14:06:26 -0400
Subject: [PATCH] Release 0.4 (#49)

* Inaugurated 0.4.0 dev series

* Sentiment analysis (#33)

Closes #11 #12  #13 and adds Sentiment analysis!

* complexity

* complexity builtins

* complexity builtins with tests

* code review updates

* option tests

* added nltk requirement

in setup.py

* add pip install to .travis.yml

* nltk fixes

* another nltk fix

* last nltk fix?

* you know the drill

* Update .travis.yml

* nltk troubles

* some final cleanup

* if it aint broke...

* textblob sentiment

* tests and error raising

* fixed install req

* pep8 fixes

* code review updates

* fix travis file

* import fixes

* small fix

* Test corpora (#35)

* complexity

* complexity builtins

* complexity builtins with tests

* code review updates

* option tests

* added nltk requirement

in setup.py

* add pip install to .travis.yml

* nltk fixes

* another nltk fix

* last nltk fix?

* you know the drill

* Update .travis.yml

* nltk troubles

* some final cleanup

* if it aint broke...

* new corpora

in English!!

* hotfix to add timestamp as corpus identifier

* Skl compatibility (#41)

* Add sklearn 0.17 compatibility

Paper over library reorganization.

* renamed corpora to corpus, added deprecation warning (#42)

* renamed corpora to corpus, added deprecation warning
* moved load_driver and set up for future forcing of full imports of submodules

Closes #31

* S3 drivers (#44)

* initial working commit for s3 driver and database driver

* removing 3.6 formatting

* adding extra requirements list

* adding basic s3 driver test

* Removing unnecessary function

* This ain't 2007

* test updates

* adding s3driver to new corpus structure

* Rounding (#45)

* bumped version

* Fix NLTK loading bug

Fix evaluation order when NLTK is not present
---
 quantgov/corpus/builtins.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/quantgov/corpus/builtins.py b/quantgov/corpus/builtins.py
index bb9b9b6..269e2ac 100644
--- a/quantgov/corpus/builtins.py
+++ b/quantgov/corpus/builtins.py
@@ -146,8 +146,10 @@ class ShannonEntropy():
                 flags=('--stopwords', '-sw'),
                 kwargs={
                     'help': 'stopwords to ignore',
-                    'default': (nltk.corpus.stopwords.words('english')
-                                if NLTK else None)
+                    'default': (
+                        None if not NLTK else
+                        nltk.corpus.stopwords.words('english')
+                    )
                 }
             ),
             quantgov.utils.CLIArg(