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.

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

Convert 10 text PEPs to reST format #196

Merged
merged 1 commit into from
Feb 2, 2017
Merged

Conversation

Mariatta
Copy link
Member

@Mariatta Mariatta commented Feb 1, 2017

PEP 208

PEP 272:

  • Fix example traceback code,
    from File "<stdin>", line 1, in ?
    into File "<stdin>", line 1, in <module>

PEP 273:

PEP 292

PEP320:

PEP 330

PEP 331:

PEP 357

PEP 3130

PEP 3140

Continuing work for #4

PEP 208

PEP 272:
- Fix example traceback code from File "<stdin>", line 1, in ?
  into File "<stdin>", line 1, in <module>

PEP 273:
- replace urls from http://python.org/sf/*
   into https://bugs.python.org/issue*

PEP 292

PEP320:
- move urls into references section
- replace urls from http://python.org/sf/*
   into https://bugs.python.org/issue*

PEP 330

PEP 331:
- fix PSF contributor agreement url
- replace urls from http://python.org/sf/*
   into https://bugs.python.org/issue*

PEP 357

PEP 3130

PEP 3140
@brettcannon
Copy link
Member

LGTM

@Mariatta Mariatta merged commit 96d2e59 into python:master Feb 2, 2017
@Mariatta Mariatta deleted the restify-peps branch February 2, 2017 17:58

>>> import DES
>>> obj = DES.new('abcdefgh', DES.MODE_ECB)
>>> plaintext = "Guido van Rossum is a space alien."
>>> len(plaintext)
34
>>> obj.encrypt(plaintext)
Traceback (innermost last):
File "<stdin>", line 1, in ?
Traceback (innermost last)::
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a traceback so the additional : is not needed.

Traceback (innermost last):
File "<stdin>", line 1, in ?
Traceback (innermost last)::
File "<stdin>", line 1, in <module>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two spaced indentation looks correct to me.

Traceback (innermost last):
File "<stdin>", line 1, in ?
Traceback (innermost last)::
File "<stdin>", line 1, in <module>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we want to modernize the traceback, we also need to update Traceback (innermost last):. But I think it's better to keep the old format:

Traceback (innermost last):
  File "<stdin>", line 1, in ?
ValueError: Strings for DES must be a multiple of 8 in length

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants