Merge remote-tracking branch 'upstream/master'

1 files changed, 8 insertions, 0 deletions

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index b9d1dae6..581e29fc 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -80,6 +80,14 @@ except ImportError:
         Image = None
 
 
+def get_model_name(model_cls):
+    try:
+        return model_cls._meta.model_name
+    except AttributeError:
+        # < 1.6 used module_name instead of model_name
+        return model_cls._meta.module_name
+
+
 def get_concrete_model(model_cls):
     try:
         return model_cls._meta.concrete_model