Merge branch 'nathaniel'
diff --git a/PythonStyleGuide.wiki b/PythonStyleGuide.wiki index b33ce75..6286ce3 100644 --- a/PythonStyleGuide.wiki +++ b/PythonStyleGuide.wiki
@@ -59,7 +59,7 @@ # [PythonStyleGuide#Indentation Indentation]: _*2* spaces (*no tabs*),_ *differs from [http://www.python.org/dev/peps/pep-0008/ PEP8]* # [PythonStyleGuide#Blank_lines Blank lines]: _*2* for functions and classes, *1* for methods_ # [PythonStyleGuide#Whitespace Whitespace]: _Sparingly within a line_ - # [PythonStyleGuide#Python_Interpreter Python Interpreter]: _the one supported by_ [http://code.google.com/appengine/docs/python/purepython.html Google App Engine]: `#!/usr/bin/python2.5` + # [PythonStyleGuide#Python_Interpreter Python Interpreter]: _Variable, either omitted, `#!/usr/bin/python`, or `#!/usr/bin/python2.7`_ # [PythonStyleGuide#Comments Comments]: _`__doc__` strings, block, inline_ * [PythonStyleGuide#Doc_strings `__doc__` Strings] * [PythonStyleGuide#Modules Modules] @@ -861,12 +861,9 @@ === Python Interpreter == -Modules should begin with a "shebang" line specifying the Python -interpreter used to execute the program: +Modules which are not intended for direct execution (and which have no effect if executed) should not include a shebang line. -`#!/usr/bin/python2.5` - -[http://code.google.com/appengine/docs/python/purepython.html Google App Engine requires Python 2.5]. +Modules intended for direct execution should begin with a shebang line specifying the Python interpreter used to execute the program, most likely `#!/usr/bin/python` or `#!/usr/bin/python2.7`. == Comments ==