Merge branch 'master' of http://github.com/cherokee/webserver

cherokee · Jan 18, 2013 · 40e1b78 · 40e1b78
2 parents 304150b + 7762e32
commit 40e1b78
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/admin/wizards/django.py b/admin/wizards/django.py
@@ -108,8 +108,9 @@ def Commit_VServer (self):
         # Analize Django config file
         media_web_dir = django_figure_media_prefix (django_dir)
 
-        # Python
+        # Python 2
-        python_bin = path_find_binary (['python', 'python*'], default="python")
+        # (When Django supports python3, this should be updated. Django 1.5?)
+        python_bin = path_find_binary (['python2', 'python', 'python*'], default="python2")
 
         # Add the new rules
         config = CONFIG_VSERVER %(locals())
@@ -139,8 +140,9 @@ def Commit_Rule (self):
         src_port = cfg_source_find_free_port ()
         src_num, src_pre  = cfg_source_get_next ()
 
-        # Python
+        # Python 2
-        python_bin = path_find_binary (['python', 'python*'], default="python")
+        # (When Django supports python3, this should be updated. Django 1.5?)
+        python_bin = path_find_binary (['python2', 'python', 'python*'], default="python2")
 
         # Add the new rules
         config = CONFIG_DIR %(locals())

diff --git a/cherokee/Makefile.am b/cherokee/Makefile.am
@@ -71,10 +71,10 @@ errors.h \
 errors_defs.h
 
 errors.h: errors.py error_list.py
-	python errors.py --errors $@
+	$(PYTHON) errors.py --errors $@
 
 errors_defs.h: errors.py error_list.py
-	python errors.py --defines $@
+	$(PYTHON) errors.py --defines $@
 
 
 #

diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -1,4 +1,4 @@
-ASCIIDOC=python $(top_srcdir)/doc/build/asciidoc.py --conf-file=$(top_srcdir)/doc/build/doc.conf
+ASCIIDOC=$(PYTHON) $(top_srcdir)/doc/build/asciidoc.py --conf-file=$(top_srcdir)/doc/build/doc.conf
 
 SUFFIXES = .txt .html
 

diff --git a/doc/build/build_web.sh b/doc/build/build_web.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Layout for cherokee-project.com
-ASCIIDOC_HTML="python asciidoc.py --conf-file=web.conf"
+ASCIIDOC_HTML="python2 asciidoc.py --conf-file=web.conf"
 
 for i in ../*.txt
  do