WhatTheMike/Fox-V3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

random pep8

Browse Source
This commit is contained in:
bobloy 2018-05-12 18:25:57 -04:00
parent 3f331e2016
commit c42ba7cc8c
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chatter/chatterbot/conversation.py
View File

@ -149,11 +149,7 @@ class Statement(StatementMixin):
:returns: A dictionary representation of the statement object. :returns: A dictionary representation of the statement object.
:rtype: dict :rtype: dict
""" """
data = {} data = {'text': self.text, 'in_response_to': [], 'extra_data': self.extra_data}
data['text'] = self.text
data['in_response_to'] = []
data['extra_data'] = self.extra_data
for response in self.in_response_to: for response in self.in_response_to:
data['in_response_to'].append(response.serialize()) data['in_response_to'].append(response.serialize())
@ -212,11 +208,6 @@ class Response(object):
return self.text == other return self.text == other
def serialize(self): def serialize(self):
data = {} data = {'text': self.text, 'created_at': self.created_at.isoformat(), 'occurrence': self.occurrence}
data['text'] = self.text
data['created_at'] = self.created_at.isoformat()
data['occurrence'] = self.occurrence
return data return data

4
chatter/chatterbot/storage/sql_storage.py
View File

@ -183,7 +183,7 @@ class SQLStorageAdapter(StorageAdapter):
if isinstance(_filter, list): if isinstance(_filter, list):
if len(_filter) == 0: if len(_filter) == 0:
_query = _response_query.filter( _query = _response_query.filter(
Statement.in_response_to == None # NOQA Here must use == instead of is Statement.in_response_to is None # NOQA Here must use == instead of is
) )
else: else:
for f in _filter: for f in _filter:
@ -193,7 +193,7 @@ class SQLStorageAdapter(StorageAdapter):
if fp == 'in_response_to__contains': if fp == 'in_response_to__contains':
_query = _response_query.join(Response).filter(Response.text == _filter) _query = _response_query.join(Response).filter(Response.text == _filter)
else: else:
_query = _response_query.filter(Statement.in_response_to == None) # NOQA _query = _response_query.filter(Statement.in_response_to is None) # NOQA
else: else:
if _query: if _query:
_query = _query.filter(Response.statement_text.like('%' + _filter + '%')) _query = _query.filter(Response.statement_text.like('%' + _filter + '%'))