PEP8 fixes.

chatterbot/adapters/adaptation.py

@@ -38,4 +38,3 @@ def add_adapter(self, adapter, **kwargs):
             self.io_adapters.append(adapter)
         else:
             raise UnknownAdapterTypeException()
-

chatterbot/adapters/exceptions.py

@@ -32,4 +32,3 @@ def __init__(self, message="The adapter type recieved was not a subclass of a kn
 
     def __str__(self):
         return self.message
-

chatterbot/adapters/io/__init__.py

@@ -2,4 +2,3 @@
 from .terminal import TerminalAdapter
 from .io_json import JsonAdapter
 from .no_output import NoOutputAdapter
-

chatterbot/adapters/io/io.py

@@ -20,4 +20,3 @@ def process_response(self, input_value):
         Returns an output value.
         """
         raise AdapterNotImplementedError()
-

chatterbot/adapters/io/io_json.py

@@ -15,4 +15,3 @@ def process_input(self, input_json):
 
     def process_response(self, statement):
         return statement.serialize()
-

chatterbot/adapters/io/terminal.py

@@ -14,4 +14,3 @@ def process_input(self):
     def process_response(self, statement):
         print(statement.text)
         return statement.text
-

chatterbot/adapters/logic/base_match.py

@@ -71,4 +71,3 @@ def process(self, input_statement):
             response = self.context.storage.get_random()
 
         return confidence, response
-

chatterbot/adapters/logic/closest_match.py

@@ -35,5 +35,6 @@ def get(self, input_statement, statement_list=None):
             limit=1
         )[0]
 
-        return confidence, next((s for s in statement_list if s.text == closest_match), None)
-
+        return confidence, next(
+            (s for s in statement_list if s.text == closest_match), None
+        )

chatterbot/adapters/logic/closest_meaning.py

@@ -72,7 +72,7 @@ def get_similarity(self, string1, string2):
                 # Compare the first synset in each list of synsets
                 similarity = synset1[0].path_similarity(synset2[0])
 
-                if similarity:  
+                if similarity:
                     total_similarity = total_similarity + similarity
 
         return total_similarity
@@ -116,5 +116,6 @@ def get(self, input_statement, statement_list=None):
 
         confidence = closest_similarity / total_similarity
 
-        return confidence, next((s for s in statement_list if s.text == closest_statement), None)
-
+        return confidence, next(
+            (s for s in statement_list if s.text == closest_statement), None
+        )

chatterbot/adapters/logic/evaluate_mathematically.py

@@ -1,7 +1,8 @@
 from chatterbot.adapters.logic import LogicAdapter
 from chatterbot.conversation import Statement
 import re
-import os, json
+import os
+import json
 import decimal
 
 
@@ -52,7 +53,7 @@ def simplify_chunks(self, input_text):
                 if is_chunk_float is False:
                     is_chunk_operator = self.is_operator(chunk)
 
-                    if not is_chunk_operator is False:
+                    if is_chunk_operator is not False:
                         string += str(is_chunk_operator) + ' '
                 else:
                     string += str(is_chunk_float) + ' '

chatterbot/adapters/logic/logic.py

@@ -23,4 +23,3 @@ def process(self, statement):
         a confidence value and a statement as output.
         """
         raise AdapterNotImplementedError()
-

chatterbot/adapters/logic/mixins.py

@@ -44,4 +44,3 @@ def get_random_response(self, response_list):
         """
         from random import choice
         return choice(response_list)
-

chatterbot/adapters/logic/multi_adapter.py

@@ -36,4 +36,3 @@ def set_context(self, context):
 
         for adapter in self.adapters:
             adapter.set_context(context)
-

chatterbot/adapters/logic/time_adapter.py

@@ -29,4 +29,3 @@ def process(self, statement):
         response = Statement("The current time is " + now.strftime("%I:%M %p"))
 
         return confidence, response
-

chatterbot/adapters/storage/__init__.py

@@ -2,4 +2,3 @@
 from .jsondatabase import JsonDatabaseAdapter
 from .mongodb import MongoDatabaseAdapter
 from .twitter_storage import TwitterAdapter
-

chatterbot/adapters/storage/jsondatabase.py

@@ -49,10 +49,6 @@ def deserialize_responses(self, response_list):
         return in_response_to
 
     def _all_kwargs_match_values(self, kwarguments, values):
-
-        print "kwarguments", kwarguments
-        print "values", values
-
         for kwarg in kwarguments:
 
             if "__" in kwarg:
@@ -66,7 +62,8 @@ def _all_kwargs_match_values(self, kwarguments, values):
                     for val in values[key]:
                         text_values.append(val["text"])
 
-                    if (kwarguments[kwarg] not in text_values) and (kwarguments[kwarg] not in values[key]):
+                    if (kwarguments[kwarg] not in text_values) and (
+                            kwarguments[kwarg] not in values[key]):
                         return False
 
             if kwarg in values:
@@ -91,7 +88,8 @@ def filter(self, **kwargs):
             if self._all_kwargs_match_values(kwargs, values):
 
                 # Build the objects for the response list
-                response_list = self.deserialize_responses(values["in_response_to"])
+                in_response_to = values["in_response_to"]
+                response_list = self.deserialize_responses(in_response_to)
                 values["in_response_to"] = response_list
 
                 # Remove the text attribute from the values
@@ -138,4 +136,3 @@ def drop(self):
 
         if os.path.exists(self.database.path):
             os.remove(self.database.path)
-

chatterbot/adapters/storage/mongodb.py

@@ -9,8 +9,12 @@ class MongoDatabaseAdapter(StorageAdapter):
     def __init__(self, **kwargs):
         super(MongoDatabaseAdapter, self).__init__(**kwargs)
 
-        self.database_name = self.kwargs.get("database", "chatterbot-database")
-        self.database_uri = self.kwargs.get("database_uri", "mongodb://localhost:27017/")
+        self.database_name = self.kwargs.get(
+            "database", "chatterbot-database"
+        )
+        self.database_uri = self.kwargs.get(
+            "database_uri", "mongodb://localhost:27017/"
+        )
 
         # Use the default host and port
         self.client = MongoClient(self.database_uri)

chatterbot/adapters/storage/storage.py

@@ -54,4 +54,3 @@ def drop(self):
         Drop the database attached to a given adapter.
         """
         raise AdapterNotImplementedError()
-

chatterbot/adapters/storage/twitter_storage.py

@@ -32,9 +32,9 @@ def filter(self, **kwargs):
         """
         statement_text = kwargs.get('text')
 
-        #if not statement_text:
+        # if not statement_text:
         #    statement_text = kwargs.get('in_response_to__contains')
-        #data['in_reply_to_status_id_str']
+        # data['in_reply_to_status_id_str']
 
         # If no text parameter was given get a selection of recent tweets
         if not statement_text:
@@ -98,4 +98,3 @@ def drop(self):
         this case so it cannot be removed.
         """
         pass
-

chatterbot/chatterbot.py

@@ -98,4 +98,3 @@ def train(self, conversation=None, *args, **kwargs):
                 trainer.train_from_corpora(corpora)
         else:
             trainer.train_from_list(conversation)
-

chatterbot/conversation/__init__.py

@@ -1,4 +1,3 @@
 from .statement import Statement
 from .signature import Signature
 from .statement import Response
-

chatterbot/conversation/signature.py

@@ -20,4 +20,3 @@ def serialize(self):
         signature['time'] = self.time
 
         return signature
-

chatterbot/conversation/statement.py

@@ -109,4 +109,3 @@ def serialize(self):
             data["signature"].append(signature.serialize())
 
         return data
-

chatterbot/conversation/utils.py

@@ -18,4 +18,3 @@ def get_response_statements(statement_list):
         statement_list.remove(statement)
 
     return statement_list
-

chatterbot/corpus/__init__.py

@@ -1,2 +1 @@
 from .corpus import Corpus
-

chatterbot/corpus/corpus.py

@@ -1,4 +1,4 @@
-import os, json
+import os
 
 
 class Corpus(object):
@@ -27,6 +27,8 @@ def read_corpus(self, file_name):
         """
         Read and return the data from a corpus json file.
         """
+        import json
+
         with open(file_name) as data_file:
             data = json.load(data_file)
         return data
@@ -58,4 +60,3 @@ def load_corpus(self, dotted_path):
                 corpora.append(corpus[key])
 
         return corpora
-

chatterbot/training.py

@@ -35,4 +35,3 @@ def train_from_corpora(self, corpora):
             for data in corpus_data:
                 for pair in data:
                     self.train_from_list(pair)
-

chatterbot/utils/clean.py

@@ -1,5 +1,6 @@
 import re
 
+
 def clean_whitespace(text):
     """
     Remove any extra whitespace and line breaks as needed.
@@ -15,17 +16,19 @@ def clean_whitespace(text):
 
     return text
 
+
 def clean(text):
     """
     A function for cleaning a string of text.
     Returns valid ASCII characters.
     """
-    import sys, unicodedata
+    import unicodedata
+    import sys
 
     text = clean_whitespace(text)
 
     # Remove links from message
-    #text = re.sub(r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', '', text)
+    # text = re.sub(r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', '', text)
 
     # Replace HTML escape characters
     if sys.version_info[0] < 3:

tests/conversation_tests/test_utils.py

@@ -16,4 +16,5 @@ def test_get_statements_with_known_responses(self):
         responses = get_response_statements(statement_list)
 
         self.assertEqual(len(responses), 2)
-
+        self.assertIn("This is a phone.", responses)
+        self.assertIn("A what?", responses)