Merge pull request #59 from kallisti5/master

Fixes for python 3 environments, add ArchLinux notes to readme. Thanks kallisti5 for this work!

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::
 

admin/server.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # -*- coding: utf-8 -*-
 #

admin/upgrade_config.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Cherokee CLI configuration conversion
 #

cherokee/cherokee-admin-launcher

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # -*- coding: utf-8; mode: python -*-
 #

cherokee/cherokee-tweak

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # -*- coding: utf-8; mode: python -*-
 #

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) {

contrib/tracelor.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 ##
 ## Cherokee trace colorizer

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
 

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;"

doc/test_images.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Cherokee Doc: Image checker
 #

doc/test_links.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Cherokee Doc: Link checker
 #

po/admin/generate_POTFILESin.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Cherokee POTFILES.in generator
 #

po/po_stats.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 
 # Cherokee PO stats

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()

qa/run-tests.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 
 # Cherokee QA Tests