diff options
| author | Xiang Zhang <angwerzx@126.com> | 2017-03-11 06:07:30 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-11 06:07:30 (GMT) |
| commit | 16416c22f9b8d9e067506d3a98f661756c80389c (patch) | |
| tree | f8fe29c4fd16a8ae4b12cf3543f0de3b146a608a /Modules | |
| parent | 701f13ab930b62a634579951dc610f737f461135 (diff) | |
| download | cpython-16416c22f9b8d9e067506d3a98f661756c80389c.zip cpython-16416c22f9b8d9e067506d3a98f661756c80389c.tar.gz cpython-16416c22f9b8d9e067506d3a98f661756c80389c.tar.bz2 | |
bpo-29770: remove outdated PYO related info (GH-590) (GH-612)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/main.c | 2 | ||||
| -rw-r--r-- | Modules/zipimport.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Modules/main.c b/Modules/main.c index 2e6a60b..2a0b1b3 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -53,7 +53,7 @@ static const char usage_1[] = "\ Options and arguments (and corresponding environment variables):\n\ -b : issue warnings about str(bytes_instance), str(bytearray_instance)\n\ and comparing bytes/bytearray with str. (-bb: issue errors)\n\ --B : don't write .py[co] files on import; also PYTHONDONTWRITEBYTECODE=x\n\ +-B : don't write .pyc files on import; also PYTHONDONTWRITEBYTECODE=x\n\ -c cmd : program passed in as string (terminates option list)\n\ -d : debug output from parser; also PYTHONDEBUG=x\n\ -E : ignore PYTHON* environment variables (such as PYTHONPATH)\n\ diff --git a/Modules/zipimport.c b/Modules/zipimport.c index 59046aa..cccc033 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -1102,7 +1102,7 @@ get_decompress_func(void) _Py_IDENTIFIER(decompress); if (importing_zlib != 0) - /* Someone has a zlib.py[co] in their Zip file; + /* Someone has a zlib.pyc in their Zip file; let's avoid a stack overflow. */ return NULL; importing_zlib = 1; @@ -1261,7 +1261,7 @@ eq_mtime(time_t t1, time_t t2) return d <= 1; } -/* Given the contents of a .py[co] file in a buffer, unmarshal the data +/* Given the contents of a .pyc file in a buffer, unmarshal the data and return the code object. Return None if it the magic word doesn't match (we do this instead of raising an exception as we fall back to .py if available and we don't want to mask other errors). @@ -1403,7 +1403,7 @@ get_mtime_of_source(ZipImporter *self, PyObject *path) PyObject *toc_entry, *stripped; time_t mtime; - /* strip 'c' or 'o' from *.py[co] */ + /* strip 'c' from *.pyc */ if (PyUnicode_READY(path) == -1) return (time_t)-1; stripped = PyUnicode_FromKindAndData(PyUnicode_KIND(path), |