Commit 27be77c3 authored by AJ Alt's avatar AJ Alt

Fix incorrect usage of NotImplemented

`NotImplemented` is a constant singleton used in rich comparison
overloading. It is not callable, and is not an exception.
`NotImplementedError` is a built in exception.
parent c7a57c02
...@@ -96,7 +96,7 @@ class ModelView(BaseModelView): ...@@ -96,7 +96,7 @@ class ModelView(BaseModelView):
""" """
Scaffold list columns Scaffold list columns
""" """
raise NotImplemented() raise NotImplementedError()
def scaffold_sortable_columns(self): def scaffold_sortable_columns(self):
""" """
...@@ -126,7 +126,7 @@ class ModelView(BaseModelView): ...@@ -126,7 +126,7 @@ class ModelView(BaseModelView):
:param name: :param name:
Either field name or field instance Either field name or field instance
""" """
raise NotImplemented() raise NotImplementedError()
def is_valid_filter(self, filter): def is_valid_filter(self, filter):
""" """
...@@ -138,7 +138,7 @@ class ModelView(BaseModelView): ...@@ -138,7 +138,7 @@ class ModelView(BaseModelView):
return isinstance(filter, BasePyMongoFilter) return isinstance(filter, BasePyMongoFilter)
def scaffold_form(self): def scaffold_form(self):
raise NotImplemented() raise NotImplementedError()
def _get_field_value(self, model, name): def _get_field_value(self, model, name):
""" """
......
...@@ -25,7 +25,7 @@ class QueryAjaxModelLoader(AjaxModelLoader): ...@@ -25,7 +25,7 @@ class QueryAjaxModelLoader(AjaxModelLoader):
primary_keys = model._sa_class_manager.mapper.primary_key primary_keys = model._sa_class_manager.mapper.primary_key
if len(primary_keys) > 1: if len(primary_keys) > 1:
raise NotImplemented('Flask-Admin does not support multi-pk AJAX model loading.') raise NotImplementedError('Flask-Admin does not support multi-pk AJAX model loading.')
self.pk = primary_keys[0].name self.pk = primary_keys[0].name
......
...@@ -36,7 +36,7 @@ class BaseRule(object): ...@@ -36,7 +36,7 @@ class BaseRule(object):
:param field_args: :param field_args:
Optional arguments that should be passed to template or the field Optional arguments that should be passed to template or the field
""" """
raise NotImplemented() raise NotImplementedError()
class NestedRule(BaseRule): class NestedRule(BaseRule):
......
...@@ -20,7 +20,7 @@ class BaseMenu(object): ...@@ -20,7 +20,7 @@ class BaseMenu(object):
self._children.append(menu) self._children.append(menu)
def get_url(self): def get_url(self):
raise NotImplemented() raise NotImplementedError()
def is_category(self): def is_category(self):
return False return False
......
...@@ -19,7 +19,7 @@ class AjaxModelLoader(object): ...@@ -19,7 +19,7 @@ class AjaxModelLoader(object):
""" """
Return (id, name) tuple from the model. Return (id, name) tuple from the model.
""" """
raise NotImplemented() raise NotImplementedError()
def get_one(self, pk): def get_one(self, pk):
""" """
...@@ -28,7 +28,7 @@ class AjaxModelLoader(object): ...@@ -28,7 +28,7 @@ class AjaxModelLoader(object):
:param pk: :param pk:
Primary key value Primary key value
""" """
raise NotImplemented() raise NotImplementedError()
def get_list(self, query, offset=0, limit=DEFAULT_PAGE_SIZE): def get_list(self, query, offset=0, limit=DEFAULT_PAGE_SIZE):
""" """
...@@ -43,4 +43,4 @@ class AjaxModelLoader(object): ...@@ -43,4 +43,4 @@ class AjaxModelLoader(object):
:param limit: :param limit:
Limit Limit
""" """
raise NotImplemented() raise NotImplementedError()
...@@ -667,7 +667,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -667,7 +667,7 @@ class BaseModelView(BaseView, ActionsMixin):
""" """
Return PK value from a model object. Return PK value from a model object.
""" """
raise NotImplemented() raise NotImplementedError()
# List view # List view
def scaffold_list_columns(self): def scaffold_list_columns(self):
...@@ -680,7 +680,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -680,7 +680,7 @@ class BaseModelView(BaseView, ActionsMixin):
['name', 'first_name', 'last_name'] ['name', 'first_name', 'last_name']
""" """
raise NotImplemented('Please implement scaffold_list_columns method') raise NotImplementedError('Please implement scaffold_list_columns method')
def get_column_name(self, field): def get_column_name(self, field):
""" """
...@@ -719,7 +719,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -719,7 +719,7 @@ class BaseModelView(BaseView, ActionsMixin):
Expected return format is a dictionary, where keys are field names and Expected return format is a dictionary, where keys are field names and
values are property names. values are property names.
""" """
raise NotImplemented('Please implement scaffold_sortable_columns method') raise NotImplementedError('Please implement scaffold_sortable_columns method')
def get_sortable_columns(self): def get_sortable_columns(self):
""" """
...@@ -820,7 +820,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -820,7 +820,7 @@ class BaseModelView(BaseView, ActionsMixin):
Create `form.BaseForm` inherited class from the model. Must be Create `form.BaseForm` inherited class from the model. Must be
implemented in the child class. implemented in the child class.
""" """
raise NotImplemented('Please implement scaffold_form method') raise NotImplementedError('Please implement scaffold_form method')
def get_form(self): def get_form(self):
""" """
...@@ -927,7 +927,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -927,7 +927,7 @@ class BaseModelView(BaseView, ActionsMixin):
List of filter tuples. First value in a tuple is a search List of filter tuples. First value in a tuple is a search
index, second value is a search value. index, second value is a search value.
""" """
raise NotImplemented('Please implement get_list method') raise NotImplementedError('Please implement get_list method')
def get_one(self, id): def get_one(self, id):
""" """
...@@ -938,7 +938,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -938,7 +938,7 @@ class BaseModelView(BaseView, ActionsMixin):
:param id: :param id:
Model id Model id
""" """
raise NotImplemented('Please implement get_one method') raise NotImplementedError('Please implement get_one method')
# Exception handler # Exception handler
def handle_view_exception(self, exc): def handle_view_exception(self, exc):
...@@ -1046,7 +1046,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -1046,7 +1046,7 @@ class BaseModelView(BaseView, ActionsMixin):
:param form: :param form:
Form instance Form instance
""" """
raise NotImplemented() raise NotImplementedError()
def update_model(self, form, model): def update_model(self, form, model):
""" """
...@@ -1061,7 +1061,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -1061,7 +1061,7 @@ class BaseModelView(BaseView, ActionsMixin):
:param model: :param model:
Model instance Model instance
""" """
raise NotImplemented() raise NotImplementedError()
def delete_model(self, model): def delete_model(self, model):
""" """
...@@ -1074,7 +1074,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -1074,7 +1074,7 @@ class BaseModelView(BaseView, ActionsMixin):
:param model: :param model:
Model instance Model instance
""" """
raise NotImplemented() raise NotImplementedError()
# Various helpers # Various helpers
def _prettify_name(self, name): def _prettify_name(self, name):
...@@ -1222,7 +1222,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -1222,7 +1222,7 @@ class BaseModelView(BaseView, ActionsMixin):
""" """
Model backend will override this to implement AJAX model loading. Model backend will override this to implement AJAX model loading.
""" """
raise NotImplemented() raise NotImplementedError()
# Views # Views
@expose('/') @expose('/')
......
...@@ -67,7 +67,7 @@ class BaseFilter(object): ...@@ -67,7 +67,7 @@ class BaseFilter(object):
:param query: :param query:
Query Query
""" """
raise NotImplemented() raise NotImplementedError()
def operation(self): def operation(self):
""" """
...@@ -75,7 +75,7 @@ class BaseFilter(object): ...@@ -75,7 +75,7 @@ class BaseFilter(object):
For example: u'equals' For example: u'equals'
""" """
raise NotImplemented() raise NotImplementedError()
def __unicode__(self): def __unicode__(self):
return self.name return self.name
......
...@@ -135,7 +135,7 @@ class ModelConverterBase(object): ...@@ -135,7 +135,7 @@ class ModelConverterBase(object):
def get_form(self, model, base_class=BaseForm, def get_form(self, model, base_class=BaseForm,
only=None, exclude=None, only=None, exclude=None,
field_args=None): field_args=None):
raise NotImplemented() raise NotImplementedError()
class InlineModelConverterBase(object): class InlineModelConverterBase(object):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment