--- /etc/bash_completion.d/django_bash_completion	2008-02-21 18:15:16.000000000 +0100
+++ /tmp/new	2008-02-21 18:15:13.000000000 +0100
@@ -62,15 +62,15 @@
           ||
           # python manage.py, /some/path/python manage.py (if manage.py exists)
           ( ${COMP_CWORD} -eq 2 &&
-            ( $( basename ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
-            ( $( basename ${COMP_WORDS[1]} ) == manage.py) &&
+            ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
+            ( $( basename -- ${COMP_WORDS[1]} ) == manage.py) &&
             ( -r ${COMP_WORDS[1]} ) ) 
           ||
           ( ${COMP_CWORD} -eq 2 &&
-            ( $( basename ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
+            ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
             ( 
-                ( $( basename ${COMP_WORDS[1]} ) == django-admin.py) ||
-                ( $( basename ${COMP_WORDS[1]} ) == django-admin)
+                ( $( basename -- ${COMP_WORDS[1]} ) == django-admin.py) ||
+                ( $( basename -- ${COMP_WORDS[1]} ) == django-admin)
             ) &&
             ( -r ${COMP_WORDS[1]} ) ) ]] ; then
 
@@ -153,7 +153,7 @@
 if command -v whereis &>/dev/null; then
     python_interpreters=$(whereis python | cut -d " " -f 2-) 
     for python in $python_interpreters; do
-        pythons="${pythons} $(basename $python)"
+        pythons="${pythons} $(basename -- $python)"
     done
     pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
 else