Fix deprecation warning for menu (#154)

Author: kytta

CHANGES

@@ -3,6 +3,7 @@ django-simple-menu changelog
 
 Unreleased
 - Test on Python 3.12
+- Fix deprecation notice appearing whe it shouldn't (#153)
 
 Version 2.1.3 - Released October 4th, 2023
 - Stop testing under Python 3.6, 3.7, and Django 4.0 (#138, #140)

menu/menu.py

@@ -3,8 +3,9 @@
 from simple_menu.menu import *
 
 warnings.warn(
-    "Importing from 'menu' will be removed in django-simple-menu v2.3 and/or "
-    "v3.0. Use imports from 'simple_menu' package instead.",
+    "Importing from 'menu' is deprecated. Import from 'simple_menu' instead. "
+    "The old import will be removed in django-simple-menu v3, but no earlier "
+    "than on 2024-04-01.",
     DeprecationWarning,
     stacklevel=2
 )

menu/templatetags/__init__.py

@@ -1 +1,11 @@
-from simple_menu.templatetags.menu import *
+import warnings
+
+from simple_menu.templatetags.simple_menu import *
+
+warnings.warn(
+    "Loading from 'menu' is deprecated. Use '{% load simple_menu %}' instead. "
+    "The old template library will be removed in django-simple-menu v3, but "
+    "no earlier than on 2024-04-01.",
+    DeprecationWarning,
+    stacklevel=2
+)

menu/templatetags/menu.py

@@ -217,7 +217,7 @@ def test_template_tag(self):
         """
         request = self.factory.get('/parent3/kids3-1')
         out = Template(
-            "{% load menu %}"
+            "{% load simple_menu %}"
             "{% generate_menu %}"
             "{% for item in menus.test %}"
             "{{ item.title }},"
@@ -240,7 +240,7 @@ def test_template_tag_missing_attribute(self):
         """
         request = self.factory.get('/parent2/kids2-1')
         out = Template(
-            "{% load menu %}"
+            "{% load simple_menu %}"
             "{% generate_menu %}"
             "{% for item in menus.test %}"
             "{{ item.title }}{{ item.doesntexist }},"