Merge pull request #5158 from kivy/fix_deprecated

Fix deprecate notes, add decorator where missing
kivy · May 7, 2017 · a63ddd4 · a63ddd4
2 parents 9fa618d + a56cb2d
commit a63ddd4
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 21 deletions.
diff --git a/kivy/adapters/__init__.py b/kivy/adapters/__init__.py
@@ -4,8 +4,7 @@
 
 .. versionadded:: 1.5.0
 
-.. note::
-
+.. deprecated:: 1.10.0
     The feature has been deprecated.
 
 An adapter is a mediating controller-type class that processes and presents

diff --git a/kivy/adapters/adapter.py b/kivy/adapters/adapter.py
@@ -4,8 +4,7 @@
 
 .. versionadded:: 1.5
 
-.. note::
-
+.. deprecated:: 1.10.0
     The feature has been deprecated.
 
 .. warning::

diff --git a/kivy/adapters/args_converters.py b/kivy/adapters/args_converters.py
@@ -4,8 +4,7 @@
 
 .. versionadded:: 1.5
 
-.. note::
-
+.. deprecated:: 1.10.0
     The feature has been deprecated.
 
 The default list item args converter for list adapters is a function (shown

diff --git a/kivy/adapters/dictadapter.py b/kivy/adapters/dictadapter.py
@@ -4,8 +4,7 @@
 
 .. versionadded:: 1.5
 
-.. note::
-
+.. deprecated:: 1.10.0
     The feature has been deprecated.
 
 .. warning::
@@ -26,6 +25,7 @@
 
 from kivy.properties import ListProperty, DictProperty
 from kivy.adapters.listadapter import ListAdapter
+from kivy.utils import deprecated
 
 
 class DictAdapter(ListAdapter):
@@ -55,6 +55,7 @@ class DictAdapter(ListAdapter):
     to None.
     '''
 
+    @deprecated
     def __init__(self, **kwargs):
         if 'sorted_keys' in kwargs:
             if type(kwargs['sorted_keys']) not in (tuple, list):

diff --git a/kivy/adapters/listadapter.py b/kivy/adapters/listadapter.py
@@ -4,8 +4,7 @@
 
 .. versionadded:: 1.5
 
-.. note::
-
+.. deprecated:: 1.10.0
     The feature has been deprecated.
 
 .. warning::
@@ -55,6 +54,7 @@
 from kivy.properties import OptionProperty
 from kivy.properties import NumericProperty
 from kivy.lang import Builder
+from kivy.utils import deprecated
 
 
 class ListAdapter(Adapter, EventDispatcher):
@@ -181,6 +181,7 @@ class ListAdapter(Adapter, EventDispatcher):
 
     __events__ = ('on_selection_change', )
 
+    @deprecated
     def __init__(self, **kwargs):
         super(ListAdapter, self).__init__(**kwargs)
 

diff --git a/kivy/adapters/models.py b/kivy/adapters/models.py
@@ -4,8 +4,7 @@
 
 .. versionadded:: 1.5
 
-.. note::
-
+.. deprecated:: 1.10.0
     The feature has been deprecated.
 
 .. warning::

diff --git a/kivy/adapters/simplelistadapter.py b/kivy/adapters/simplelistadapter.py
@@ -4,8 +4,7 @@
 
 .. versionadded:: 1.5
 
-.. note::
-
+.. deprecated:: 1.10.0
     The feature has been deprecated.
 
 .. warning::
@@ -24,6 +23,7 @@
 from kivy.adapters.adapter import Adapter
 from kivy.properties import ListProperty
 from kivy.lang import Builder
+from kivy.utils import deprecated
 
 
 class SimpleListAdapter(Adapter):
@@ -45,6 +45,7 @@ class SimpleListAdapter(Adapter):
     defaults to [].
     '''
 
+    @deprecated
     def __init__(self, **kwargs):
         if 'data' not in kwargs:
             raise Exception('list adapter: input must include data argument')

diff --git a/kivy/interactive.py b/kivy/interactive.py
@@ -4,7 +4,7 @@
 
 .. versionadded:: 1.3.0
 
-.. versionchanged:: 1.10.0
+.. deprecated:: 1.10.0
     The interactive launcher has been deprecated.
 
 The :class:`InteractiveLauncher` provides a user-friendly python shell

diff --git a/kivy/uix/abstractview.py b/kivy/uix/abstractview.py
@@ -4,8 +4,7 @@
 
 .. versionadded:: 1.5
 
-.. note::
-
+.. deprecated:: 1.10.0
     The feature has been deprecated.
 
 .. warning::

diff --git a/kivy/uix/listview.py b/kivy/uix/listview.py
@@ -4,8 +4,7 @@
 
 .. versionadded:: 1.5
 
-.. note::
-
+.. deprecated:: 1.10.0
     ListView has been deprecated, use
     :class:`~kivy.uix.recycleview.RecycleView` instead.
 

diff --git a/kivy/uix/selectableview.py b/kivy/uix/selectableview.py
@@ -2,8 +2,7 @@
 SelectableView
 ==============
 
-.. note::
-
+.. deprecated:: 1.10.0
     The feature has been deprecated.
 
 This module houses the :class:`SelectableView` mixin class. This is used by