Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a few missed python calls #61

Merged
merged 2 commits into from
Jan 18, 2013
Merged

Fix a few missed python calls #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd92486
python: fix a few missed python references
kallisti5 Jan 18, 2013
43928d8
django: Specify python 2 binary
kallisti5 Jan 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions admin/wizards/django.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion doc/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion doc/build/build_web.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down