Organize removal of deprecated code

4 files changed, 16 insertions, 6 deletions

diff --git a/TODO.txt b/TODO.txt
new file mode 100644
index 00000000..8e00141e
--- /dev/null
+++ b/TODO.txt
@@ -0,0 +1,10 @@
+Make sure to review ``networkx/conftest.py`` after removing deprecated code.
+
+Version 3.0
+-----------
+
+* In ``networkx/readwrite/gml.py`` remove ``literal_stringizer`` and related tests.
+* In ``networkx/readwrite/gml.py`` remove ``literal_destringizer`` and related tests.
+* In ``networkx/utils/misc.py`` remove ``is_string_like`` and related tests.
+* In ``networkx/utils/misc.py`` remove ``make_str`` and related tests.
+* Remove ``networkx/utils/contextmanagers.py`` and related tests.
diff --git a/networkx/readwrite/gml.py b/networkx/readwrite/gml.py
index 683cc7ce..1c3eab12 100644
--- a/networkx/readwrite/gml.py
+++ b/networkx/readwrite/gml.py
@@ -101,7 +101,7 @@ def literal_destringizer(rep):
     ValueError
         If `rep` is not a Python literal.
     """
-    msg = "literal_destringizer is deprecated and will be removed in 2.6."
+    msg = "literal_destringizer is deprecated and will be removed in 3.0."
     warnings.warn(msg, DeprecationWarning)
     if isinstance(rep, str):
         orig_rep = rep
@@ -496,7 +496,7 @@ def literal_stringizer(value):
     The original value can be recovered using the
     :func:`networkx.readwrite.gml.literal_destringizer` function.
     """
-    msg = "literal_stringizer is deprecated and will be removed in 2.6."
+    msg = "literal_stringizer is deprecated and will be removed in 3.0."
     warnings.warn(msg, DeprecationWarning)
 
     def stringize(value):
diff --git a/networkx/utils/contextmanagers.py b/networkx/utils/contextmanagers.py
index 1dac72bc..bd36a36c 100644
--- a/networkx/utils/contextmanagers.py
+++ b/networkx/utils/contextmanagers.py
@@ -22,9 +22,9 @@ def reversed(G):
     The reversed context manager is deprecated in favor
     of G.reverse(copy=False). The view allows multiple threads to use the
     same graph without confusion while the context manager does not.
-    This context manager is scheduled to be removed in version 2.7.
+    This context manager is scheduled to be removed in version 3.0.
     """
-    msg = "context manager reversed is deprecated and to be removed in 2.7." \
+    msg = "context manager reversed is deprecated and to be removed in 3.0." \
           "Use G.reverse(copy=False) if G.is_directed() else G instead."
     warnings.warn(msg, DeprecationWarning)
 
diff --git a/networkx/utils/misc.py b/networkx/utils/misc.py
index e4bfd0c7..86a637bb 100644
--- a/networkx/utils/misc.py
+++ b/networkx/utils/misc.py
@@ -27,7 +27,7 @@ import networkx as nx
 
 def is_string_like(obj):  # from John Hunter, types-free version
     """Check if obj is string."""
-    msg = "is_string_like is deprecated and will be removed in 2.6." \
+    msg = "is_string_like is deprecated and will be removed in 3.0." \
           "Use isinstance(obj, str) instead."
     warnings.warn(msg, DeprecationWarning)
     return isinstance(obj, str)
@@ -111,7 +111,7 @@ def is_list_of_ints(intlist):
 
 def make_str(x):
     """Returns the string representation of t."""
-    msg = "make_str is deprecated and will be removed in 2.6. Use str instead."
+    msg = "make_str is deprecated and will be removed in 3.0. Use str instead."
     warnings.warn(msg, DeprecationWarning)
     return str(x)