Skip to content

Loading…

Fixes for python 3 environments, add ArchLinux notes to readme #59

Merged
merged 2 commits into from

2 participants

@kallisti5

This replaces all calls to python with python2 as python 3 causes a large number of problems.

Update cherokee c code to check for python2 vs python as well.

Solves #58

kallisti5 added some commits
@kallisti5 kallisti5 Readme: Add info on pacman packages e766cdf
@kallisti5 kallisti5 python: Make sure we specify python2
* python3 causes extensive errors
* the python2 binary exists on all of
  my test systems (even when python3
  isn't installed)
* solves gh issue #58
97c1b2e
@skinkie skinkie merged commit 273575c into cherokee:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 16, 2013
  1. @kallisti5
Commits on Jan 17, 2013
  1. @kallisti5

    python: Make sure we specify python2

    kallisti5 committed
    * python3 causes extensive errors
    * the python2 binary exists on all of
      my test systems (even when python3
      isn't installed)
    * solves gh issue #58
View
4 README.rst
@@ -22,6 +22,10 @@ or, for Yum-based systems, such as RedHat, CentOS or Fedora::
sudo yum install autoconf automake libtool
+or, for Pacman-based systems such as ArchLinux::
+
+ sudo pacman -Sy autoconf automake libtool
+
To check out the code from GitHub, including all dependencies that are
specified as Git submodules, do the following::
View
2 admin/server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# -*- coding: utf-8 -*-
#
View
2 admin/upgrade_config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# Cherokee CLI configuration conversion
#
View
2 cherokee/cherokee-admin-launcher
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# -*- coding: utf-8; mode: python -*-
#
View
2 cherokee/cherokee-tweak
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# -*- coding: utf-8; mode: python -*-
#
View
2 cherokee/main_admin.c
@@ -554,7 +554,7 @@ check_for_python (void)
int re;
pid_t pid;
int exitcode = -1;
- char const *args[] = {"env", "python", "-c", "raise SystemExit", NULL};
+ char const *args[] = {"env", "python2", "-c", "raise SystemExit", NULL};
pid = fork();
if (pid == -1) {
View
2 contrib/tracelor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
##
## Cherokee trace colorizer
View
2 doc/build/asciidoc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
"""
asciidoc - converts an AsciiDoc text file to DocBook, HTML or LinuxDoc
View
2 doc/cookbook_dbslayer.txt
@@ -218,7 +218,7 @@ the server name and prepare a database accessible with the parameters
detailed above (database name, user parameters and so on).
--------------------------------------
-#!/usr/bin/env python
+#!/usr/bin/env python2
import urllib
sql="SELECT * FROM my_table;"
View
2 doc/test_images.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# Cherokee Doc: Image checker
#
View
2 doc/test_links.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# Cherokee Doc: Link checker
#
View
2 po/admin/generate_POTFILESin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# Cherokee POTFILES.in generator
#
View
2 po/po_stats.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# -*- coding: utf-8 -*-
# Cherokee PO stats
View
2 qa/fcgi.py
@@ -34,7 +34,7 @@
Example usage:
- #!/usr/bin/env python
+ #!/usr/bin/env python2
from myapplication import app # Assume app is your WSGI application object
from fcgi import WSGIServer
WSGIServer(app).run()
View
2 qa/run-tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# -*- coding: utf-8 -*-
# Cherokee QA Tests
Something went wrong with that request. Please try again.