Remove deprecated code

gunthercox · Dec 30, 2016 · c5bcaf4 · c5bcaf4
1 parent 607d010
commit c5bcaf4
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 214 deletions.
diff --git a/chatterbot/conversation/comparisons.py b/chatterbot/conversation/comparisons.py
diff --git a/chatterbot/conversation/response_selection.py b/chatterbot/conversation/response_selection.py
diff --git a/chatterbot/conversation/session.py b/chatterbot/conversation/session.py
@@ -47,11 +47,3 @@ def update(self, session_id, conversance):
         session_id = str(session_id)
         if session_id in self.sessions:
             self.sessions[session_id].conversation.append(conversance)
-
-    def get_default(self):
-        import warnings
-        warnings.warn("get_default is deprecated. Use 'get' instead.", DeprecationWarning)
-
-    def update_default(self, conversance):
-        import warnings
-        warnings.warn("update_default is deprecated. Use 'update' instead.", DeprecationWarning)
diff --git a/chatterbot/logic/__init__.py b/chatterbot/logic/__init__.py
@@ -1,12 +1,8 @@
 from .logic_adapter import LogicAdapter
 from .best_match import BestMatch
-from .closest_match import ClosestMatchAdapter
-from .closest_meaning import ClosestMeaningAdapter
 from .low_confidence import LowConfidenceAdapter
 from .mathematical_evaluation import MathematicalEvaluation
 from .multi_adapter import MultiLogicAdapter
 from .no_knowledge_adapter import NoKnowledgeAdapter
 from .specific_response import SpecificResponseAdapter
 from .time_adapter import TimeLogicAdapter
-
-BaseMatchAdapter = BestMatch
diff --git a/chatterbot/logic/closest_match.py b/chatterbot/logic/closest_match.py
diff --git a/chatterbot/logic/closest_meaning.py b/chatterbot/logic/closest_meaning.py
diff --git a/chatterbot/logic/logic_adapter.py b/chatterbot/logic/logic_adapter.py
@@ -14,14 +14,6 @@ def __init__(self, **kwargs):
         from chatterbot.comparisons import levenshtein_distance
         from chatterbot.response_selection import get_first_response
 
-        if 'tie_breaking_method' in kwargs:
-            raise DeprecationWarning(
-                'The parameter "tie_breaking_method" has been removed. ' +
-                'Instead, pass a callable to "response_selection_method". ' +
-                'See documentation for details: ' +
-                'http://chatterbot.readthedocs.io/en/latest/logic/response_selection.html#setting-the-response-selection-method'
-            )
-
         # Import string module parameters
         if 'statement_comparison_function' in kwargs:
             import_path = kwargs.get('statement_comparison_function')

diff --git a/chatterbot/output/__init__.py b/chatterbot/output/__init__.py
@@ -1,7 +1,6 @@
 from .output_adapter import OutputAdapter
 from .microsoft import Microsoft
 from .terminal import TerminalAdapter
-from .output_format_adapter import OutputFormatAdapter
 from .mailgun import Mailgun
 from .gitter import Gitter
 from .hipchat import HipChat
diff --git a/chatterbot/output/output_format_adapter.py b/chatterbot/output/output_format_adapter.py
diff --git a/tests/output_adapter_tests/test_output_format_adapter.py b/tests/output_adapter_tests/test_output_format_adapter.py
diff --git a/tests/test_response_selection.py b/tests/test_response_selection.py
@@ -1,5 +1,5 @@
 from unittest import TestCase
-from chatterbot.conversation import response_selection
+from chatterbot import response_selection
 from chatterbot.conversation import Statement, Response