#1547 fix honouring SHELL_PLUS setting

django-extensions · Jun 30, 2020 · d777e23 · d777e23
1 parent f0109d4
commit d777e23
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/django_extensions/management/commands/shell_plus.py b/django_extensions/management/commands/shell_plus.py
@@ -503,14 +503,15 @@ def get_runner_by_flag(flag):
 
             self.set_application_name(options)
 
-            if get_runner:
-                runner = get_runner(options)
-                runner_name = get_runner.runner_name
-            elif SETTINGS_SHELL_PLUS:
+            if not get_runner and SETTINGS_SHELL_PLUS:
                 get_runner = get_runner_by_flag('--%s' % SETTINGS_SHELL_PLUS)
                 if not get_runner:
                     runner = None
                     runner_name = SETTINGS_SHELL_PLUS
+
+            if get_runner:
+                runner = get_runner(options)
+                runner_name = get_runner.runner_name
             else:
                 def try_runner(get_runner):
                     runner_name = get_runner.runner_name