[Python-checkins] peps: #16325: remove outdated link and rephrase paragraph accordingly.

ezio.melotti python-checkins at python.org
Sat Oct 27 23:33:38 CEST 2012


http://hg.python.org/peps/rev/be77365934e7
changeset:   4570:be77365934e7
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Oct 28 00:33:29 2012 +0300
summary:
  #16325: remove outdated link and rephrase paragraph accordingly.

files:
  pep-0008.txt |  16 ++++++----------
  1 files changed, 6 insertions(+), 10 deletions(-)


diff --git a/pep-0008.txt b/pep-0008.txt
--- a/pep-0008.txt
+++ b/pep-0008.txt
@@ -19,11 +19,9 @@
 companion informational PEP describing style guidelines for the C code
 in the C implementation of Python [1]_.
 
-This document was adapted from Guido's original Python Style Guide
-essay [2]_, with some additions from Barry's style guide [3]_.  Where
-there's conflict, Guido's style rules for the purposes of this PEP.
-This PEP may still be incomplete (in fact, it may never be finished
-<wink>).
+This document and PEP 257 (Docstring Conventions) were adapted from
+Guido's original Python Style Guide essay, with some additions from
+Barry's style guide [2]_.
 
 
 A Foolish Consistency is the Hobgoblin of Little Minds
@@ -496,7 +494,7 @@
 - ``UPPERCASE``
 - ``UPPER_CASE_WITH_UNDERSCORES``
 - ``CapitalizedWords`` (or CapWords, or CamelCase -- so named because
-  of the bumpy look of its letters [4]_).  This is also sometimes known
+  of the bumpy look of its letters [3]_).  This is also sometimes known
   as StudlyCaps.
 
   Note: When using abbreviations in CapWords, capitalize all the
@@ -963,12 +961,10 @@
 
 .. [1] PEP 7, Style Guide for C Code, van Rossum
 
-.. [2] http://www.python.org/doc/essays/styleguide.html
-
-.. [3] Barry's GNU Mailman style guide
+.. [2] Barry's GNU Mailman style guide
        http://barry.warsaw.us/software/STYLEGUIDE.txt
 
-.. [4] http://www.wikipedia.com/wiki/CamelCase
+.. [3] http://www.wikipedia.com/wiki/CamelCase
 
 
 Copyright

-- 
Repository URL: http://hg.python.org/peps


More information about the Python-checkins mailing list