fix template listing for python 2.4, which does not support the -m option with namespace packages

dhellmann · dhellmann · commit 6fd972b94b92 · 2011-09-17T14:56:46.000-04:00
diff --git a/tests/test_project_templates.sh b/tests/test_project_templates.sh
@@ -28,7 +28,7 @@ setUp () {
 
 test_list_templates () {
     output=$(mkproject -h 2>&1)
-    assertTrue "Did not find test template in \"$output\"" "echo \"$output\" | grep -q test"
+    assertTrue "Did not find test template in \"$output\"" "echo \"$output\" | grep -q 'Creates a test file'"
 }
 
 test_apply_template () {
diff --git a/virtualenvwrapper.sh b/virtualenvwrapper.sh
@@ -802,7 +802,7 @@ function mkproject_help {
     echo
     echo "Available project templates:"
     echo
-    "$VIRTUALENVWRAPPER_PYTHON" -m virtualenvwrapper.hook_loader -l project.template
+    "$VIRTUALENVWRAPPER_PYTHON" -c 'from virtualenvwrapper.hook_loader import main; main()' -l project.template
 }
 
 # Create a new project directory and its associated virtualenv.

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ setUp () {`
`28`	`28`
`29`	`29`	`test_list_templates () {`
`30`	`30`	`output=$(mkproject -h 2>&1)`
`31`		`- assertTrue "Did not find test template in \"$output\"" "echo \"$output\" \| grep -q test"`
	`31`	`+ assertTrue "Did not find test template in \"$output\"" "echo \"$output\" \| grep -q 'Creates a test file'"`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`test_apply_template () {`
Original file line number	Diff line number	Diff line change
`@@ -802,7 +802,7 @@ function mkproject_help {`
`802`	`802`	`echo`
`803`	`803`	`echo "Available project templates:"`
`804`	`804`	`echo`
`805`		`- "$VIRTUALENVWRAPPER_PYTHON" -m virtualenvwrapper.hook_loader -l project.template`
	`805`	`+ "$VIRTUALENVWRAPPER_PYTHON" -c 'from virtualenvwrapper.hook_loader import main; main()' -l project.template`
`806`	`806`	`}`
`807`	`807`
`808`	`808`	`# Create a new project directory and its associated virtualenv.`