Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix a few missed python calls #61

Merged
merged 2 commits into from

2 participants

@kallisti5

Prefer python2 vs python or python3 in Django wizard

kallisti5 added some commits
@kallisti5 kallisti5 python: fix a few missed python references bd92486
@kallisti5 kallisti5 django: Specify python 2 binary
* When Django supports python 3 and prefers it
  we should update this.
43928d8
@skinkie skinkie merged commit 3b4a147 into cherokee:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 18, 2013
  1. @kallisti5
  2. @kallisti5

    django: Specify python 2 binary

    kallisti5 authored
    * When Django supports python 3 and prefers it
      we should update this.
This page is out of date. Refresh to see the latest.
View
10 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_bin = path_find_binary (['python', 'python*'], default="python")
+ # Python 2
+ # (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_bin = path_find_binary (['python', 'python*'], default="python")
+ # Python 2
+ # (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())
View
2  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
View
2  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
Something went wrong with that request. Please try again.