Skip to content

Commit 9630419

Browse files
adrianliawadrianliaw
authored
Revert "sync with cpython 9ad2184d (#104)" (#106)
This reverts commit d54eaf6.
1 parent d54eaf6 commit 9630419

File tree

222 files changed

+17525
-21354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+17525
-21354
lines changed

‎bugs.po‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ msgid ""
1212
msgstr ""
1313
"Project-Id-Version: Python 3.7\n"
1414
"Report-Msgid-Bugs-To: \n"
15-
"POT-Creation-Date: 2021-09-07 06:52+0000\n"
15+
"POT-Creation-Date: 2020-06-20 18:08+0800\n"
1616
"PO-Revision-Date: 2018-10-13 16:29+0800\n"
1717
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1818
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -173,8 +173,8 @@ msgstr ""
173173

174174
#: ../../bugs.rst:84
175175
msgid ""
176-
"`Bug Writing Guidelines <https://bugzilla.mozilla.org/page.cgi?id=bug-"
177-
"writing.html>`_"
176+
"`Bug Report Writing Guidelines <https://developer.mozilla.org/en-US/docs/"
177+
"Mozilla/QA/Bug_writing_guidelines>`_"
178178
msgstr ""
179179

180180
#: ../../bugs.rst:84

‎c-api/arg.po‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.7\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2021-09-07 06:52+0000\n"
10+
"POT-Creation-Date: 2020-06-20 18:08+0800\n"
1111
"PO-Revision-Date: 2018-05-23 14:29+0000\n"
1212
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -240,7 +240,7 @@ msgstr ""
240240
msgid ""
241241
"Requires that the Python object is a :class:`bytes` object, without "
242242
"attempting any conversion. Raises :exc:`TypeError` if the object is not a "
243-
"bytes object. The C variable may also be declared as :c:type:`PyObject*`."
243+
"bytes object. The C variable may also be declared as :c:type:`PyObject\\*`."
244244
msgstr ""
245245

246246
#: ../../c-api/arg.rst:139
@@ -252,7 +252,7 @@ msgid ""
252252
"Requires that the Python object is a :class:`bytearray` object, without "
253253
"attempting any conversion. Raises :exc:`TypeError` if the object is not a :"
254254
"class:`bytearray` object. The C variable may also be declared as :c:type:"
255-
"`PyObject*`."
255+
"`PyObject\\*`."
256256
msgstr ""
257257

258258
#: ../../c-api/arg.rst:156
@@ -319,7 +319,7 @@ msgstr ""
319319
msgid ""
320320
"Requires that the Python object is a Unicode object, without attempting any "
321321
"conversion. Raises :exc:`TypeError` if the object is not a Unicode object. "
322-
"The C variable may also be declared as :c:type:`PyObject*`."
322+
"The C variable may also be declared as :c:type:`PyObject\\*`."
323323
msgstr ""
324324

325325
#: ../../c-api/arg.rst:192
@@ -347,12 +347,13 @@ msgstr ""
347347
#: ../../c-api/arg.rst:198
348348
msgid ""
349349
"This format requires two arguments. The first is only used as input, and "
350-
"must be a :c:type:`const char*` which points to the name of an encoding as a "
351-
"NUL-terminated string, or ``NULL``, in which case ``'utf-8'`` encoding is "
350+
"must be a :c:type:`const char\\*` which points to the name of an encoding as "
351+
"a NUL-terminated string, or ``NULL``, in which case ``'utf-8'`` encoding is "
352352
"used. An exception is raised if the named encoding is not known to Python. "
353-
"The second argument must be a :c:type:`char**`; the value of the pointer it "
354-
"references will be set to a buffer with the contents of the argument text. "
355-
"The text will be encoded in the encoding specified by the first argument."
353+
"The second argument must be a :c:type:`char\\*\\*`; the value of the pointer "
354+
"it references will be set to a buffer with the contents of the argument "
355+
"text. The text will be encoded in the encoding specified by the first "
356+
"argument."
356357
msgstr ""
357358

358359
#: ../../c-api/arg.rst:206
@@ -392,10 +393,10 @@ msgstr ""
392393
#: ../../c-api/arg.rst:221
393394
msgid ""
394395
"It requires three arguments. The first is only used as input, and must be "
395-
"a :c:type:`const char*` which points to the name of an encoding as a NUL-"
396+
"a :c:type:`const char\\*` which points to the name of an encoding as a NUL-"
396397
"terminated string, or ``NULL``, in which case ``'utf-8'`` encoding is used. "
397398
"An exception is raised if the named encoding is not known to Python. The "
398-
"second argument must be a :c:type:`char**`; the value of the pointer it "
399+
"second argument must be a :c:type:`char\\*\\*`; the value of the pointer it "
399400
"references will be set to a buffer with the contents of the argument text. "
400401
"The text will be encoded in the encoding specified by the first argument. "
401402
"The third argument must be a pointer to an integer; the referenced integer "
@@ -618,7 +619,7 @@ msgstr ""
618619
msgid ""
619620
"Store a Python object in a C object pointer. This is similar to ``O``, but "
620621
"takes two C arguments: the first is the address of a Python type object, the "
621-
"second is the address of the C variable (of type :c:type:`PyObject*`) into "
622+
"second is the address of the C variable (of type :c:type:`PyObject\\*`) into "
622623
"which the object pointer is stored. If the Python object does not have the "
623624
"required type, :exc:`TypeError` is raised."
624625
msgstr ""
@@ -631,14 +632,14 @@ msgstr ""
631632
msgid ""
632633
"Convert a Python object to a C variable through a *converter* function. "
633634
"This takes two arguments: the first is a function, the second is the address "
634-
"of a C variable (of arbitrary type), converted to :c:type:`void *`. The "
635+
"of a C variable (of arbitrary type), converted to :c:type:`void \\*`. The "
635636
"*converter* function in turn is called as follows::"
636637
msgstr ""
637638

638639
#: ../../c-api/arg.rst:339
639640
msgid ""
640641
"where *object* is the Python object to be converted and *address* is the :c:"
641-
"type:`void*` argument that was passed to the :c:func:`PyArg_Parse\\*` "
642+
"type:`void\\*` argument that was passed to the :c:func:`PyArg_Parse\\*` "
642643
"function. The returned *status* should be ``1`` for a successful conversion "
643644
"and ``0`` if the conversion has failed. When the conversion fails, the "
644645
"*converter* function should raise an exception and leave the content of "
@@ -836,12 +837,13 @@ msgid ""
836837
"should be passed as *args*; it must actually be a tuple. The length of the "
837838
"tuple must be at least *min* and no more than *max*; *min* and *max* may be "
838839
"equal. Additional arguments must be passed to the function, each of which "
839-
"should be a pointer to a :c:type:`PyObject*` variable; these will be filled "
840-
"in with the values from *args*; they will contain borrowed references. The "
841-
"variables which correspond to optional parameters not given by *args* will "
842-
"not be filled in; these should be initialized by the caller. This function "
843-
"returns true on success and false if *args* is not a tuple or contains the "
844-
"wrong number of elements; an exception will be set if there was a failure."
840+
"should be a pointer to a :c:type:`PyObject\\*` variable; these will be "
841+
"filled in with the values from *args*; they will contain borrowed "
842+
"references. The variables which correspond to optional parameters not given "
843+
"by *args* will not be filled in; these should be initialized by the caller. "
844+
"This function returns true on success and false if *args* is not a tuple or "
845+
"contains the wrong number of elements; an exception will be set if there was "
846+
"a failure."
845847
msgstr ""
846848

847849
#: ../../c-api/arg.rst:493
@@ -1105,7 +1107,7 @@ msgstr ""
11051107
msgid ""
11061108
"Convert *anything* to a Python object through a *converter* function. The "
11071109
"function is called with *anything* (which should be compatible with :c:type:"
1108-
"`void*`) as its argument and should return a \"new\" Python object, or "
1110+
"`void \\*`) as its argument and should return a \"new\" Python object, or "
11091111
"``NULL`` if an error occurred."
11101112
msgstr ""
11111113

‎c-api/bool.po‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Python 3.7\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2021-09-07 06:52+0000\n"
11+
"POT-Creation-Date: 2018-06-26 18:54+0800\n"
1212
"PO-Revision-Date: 2017-09-22 18:26+0000\n"
1313
"Last-Translator: Ching-Lung Chuang\n"
1414
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -32,36 +32,34 @@ msgid ""
3232
msgstr ""
3333

3434
#: ../../c-api/bool.rst:16
35-
msgid ""
36-
"Return true if *o* is of type :c:data:`PyBool_Type`. This function always "
37-
"succeeds."
35+
msgid "Return true if *o* is of type :c:data:`PyBool_Type`."
3836
msgstr ""
3937

40-
#: ../../c-api/bool.rst:22
38+
#: ../../c-api/bool.rst:21
4139
msgid ""
4240
"The Python ``False`` object. This object has no methods. It needs to be "
4341
"treated just like any other object with respect to reference counts."
4442
msgstr ""
4543

46-
#: ../../c-api/bool.rst:28
44+
#: ../../c-api/bool.rst:27
4745
msgid ""
4846
"The Python ``True`` object. This object has no methods. It needs to be "
4947
"treated just like any other object with respect to reference counts."
5048
msgstr ""
5149

52-
#: ../../c-api/bool.rst:34
50+
#: ../../c-api/bool.rst:33
5351
msgid ""
5452
"Return :const:`Py_False` from a function, properly incrementing its "
5553
"reference count."
5654
msgstr ""
5755

58-
#: ../../c-api/bool.rst:40
56+
#: ../../c-api/bool.rst:39
5957
msgid ""
6058
"Return :const:`Py_True` from a function, properly incrementing its reference "
6159
"count."
6260
msgstr ""
6361

64-
#: ../../c-api/bool.rst:46
62+
#: ../../c-api/bool.rst:45
6563
msgid ""
6664
"Return a new reference to :const:`Py_True` or :const:`Py_False` depending on "
6765
"the truth value of *v*."

‎c-api/buffer.po‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.7\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2021-09-07 06:52+0000\n"
10+
"POT-Creation-Date: 2020-06-20 18:08+0800\n"
1111
"PO-Revision-Date: 2018-05-23 14:30+0000\n"
1212
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -453,10 +453,6 @@ msgstr ""
453453
msgid "C or F"
454454
msgstr ""
455455

456-
#: ../../c-api/buffer.rst:304
457-
msgid ":c:macro:`PyBUF_ND`"
458-
msgstr ""
459-
460456
#: ../../c-api/buffer.rst:309
461457
msgid "compound requests"
462458
msgstr ""
@@ -572,15 +568,17 @@ msgstr ""
572568
msgid ""
573569
"Send a request to *exporter* to fill in *view* as specified by *flags*. If "
574570
"the exporter cannot provide a buffer of the exact type, it MUST raise :c:"
575-
"data:`PyExc_BufferError`, set ``view->obj`` to ``NULL`` and return ``-1``."
571+
"data:`PyExc_BufferError`, set :c:member:`view->obj` to ``NULL`` and return "
572+
"``-1``."
576573
msgstr ""
577574

578575
#: ../../c-api/buffer.rst:444
579576
msgid ""
580-
"On success, fill in *view*, set ``view->obj`` to a new reference to "
577+
"On success, fill in *view*, set :c:member:`view->obj` to a new reference to "
581578
"*exporter* and return 0. In the case of chained buffer providers that "
582-
"redirect requests to a single object, ``view->obj`` MAY refer to this object "
583-
"instead of *exporter* (See :ref:`Buffer Object Structures <buffer-structs>`)."
579+
"redirect requests to a single object, :c:member:`view->obj` MAY refer to "
580+
"this object instead of *exporter* (See :ref:`Buffer Object Structures "
581+
"<buffer-structs>`)."
584582
msgstr ""
585583

586584
#: ../../c-api/buffer.rst:449
@@ -593,8 +591,8 @@ msgstr ""
593591

594592
#: ../../c-api/buffer.rst:457
595593
msgid ""
596-
"Release the buffer *view* and decrement the reference count for ``view-"
597-
">obj``. This function MUST be called when the buffer is no longer being "
594+
"Release the buffer *view* and decrement the reference count for :c:member:"
595+
"`view->obj`. This function MUST be called when the buffer is no longer being "
598596
"used, otherwise reference leaks may occur."
599597
msgstr ""
600598

@@ -665,9 +663,9 @@ msgstr ""
665663

666664
#: ../../c-api/buffer.rst:519
667665
msgid ""
668-
"On success, set ``view->obj`` to a new reference to *exporter* and return 0. "
669-
"Otherwise, raise :c:data:`PyExc_BufferError`, set ``view->obj`` to ``NULL`` "
670-
"and return ``-1``;"
666+
"On success, set :c:member:`view->obj` to a new reference to *exporter* and "
667+
"return 0. Otherwise, raise :c:data:`PyExc_BufferError`, set :c:member:`view-"
668+
">obj` to ``NULL`` and return ``-1``;"
671669
msgstr ""
672670

673671
#: ../../c-api/buffer.rst:523

‎c-api/bytearray.po‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.7\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2021-09-07 06:52+0000\n"
10+
"POT-Creation-Date: 2020-06-20 18:08+0800\n"
1111
"PO-Revision-Date: 2015-12-09 17:51+0000\n"
1212
"Last-Translator: Liang-Bo Wang <me@liang2.tw>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -40,13 +40,13 @@ msgstr ""
4040
#: ../../c-api/bytearray.rst:27
4141
msgid ""
4242
"Return true if the object *o* is a bytearray object or an instance of a "
43-
"subtype of the bytearray type. This function always succeeds."
43+
"subtype of the bytearray type."
4444
msgstr ""
4545

4646
#: ../../c-api/bytearray.rst:33
4747
msgid ""
4848
"Return true if the object *o* is a bytearray object, but not an instance of "
49-
"a subtype of the bytearray type. This function always succeeds."
49+
"a subtype of the bytearray type."
5050
msgstr ""
5151

5252
#: ../../c-api/bytearray.rst:38

‎c-api/bytes.po‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.7\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2021-09-07 06:52+0000\n"
10+
"POT-Creation-Date: 2020-06-20 18:08+0800\n"
1111
"PO-Revision-Date: 2018-05-23 14:04+0000\n"
1212
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -41,13 +41,13 @@ msgstr ""
4141
#: ../../c-api/bytes.rst:27
4242
msgid ""
4343
"Return true if the object *o* is a bytes object or an instance of a subtype "
44-
"of the bytes type. This function always succeeds."
44+
"of the bytes type."
4545
msgstr ""
4646

4747
#: ../../c-api/bytes.rst:33
4848
msgid ""
4949
"Return true if the object *o* is a bytes object, but not an instance of a "
50-
"subtype of the bytes type. This function always succeeds."
50+
"subtype of the bytes type."
5151
msgstr ""
5252

5353
#: ../../c-api/bytes.rst:39

‎c-api/call.po‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Python 3.9\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2021-09-07 06:52+0000\n"
11+
"POT-Creation-Date: 2020-06-20 18:08+0800\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
15-
"Language: \n"
1615
"MIME-Version: 1.0\n"
1716
"Content-Type: text/plain; charset=UTF-8\n"
1817
"Content-Transfer-Encoding: 8bit\n"
@@ -443,7 +442,7 @@ msgstr ""
443442

444443
#: ../../c-api/call.rst:286
445444
msgid ""
446-
"Note that if you only pass :c:type:`PyObject *` args, :c:func:"
445+
"Note that if you only pass :c:type:`PyObject \\*` args, :c:func:"
447446
"`PyObject_CallFunctionObjArgs` is a faster alternative."
448447
msgstr ""
449448

@@ -470,7 +469,7 @@ msgstr ""
470469

471470
#: ../../c-api/call.rst:307
472471
msgid ""
473-
"Note that if you only pass :c:type:`PyObject *` args, :c:func:"
472+
"Note that if you only pass :c:type:`PyObject \\*` args, :c:func:"
474473
"`PyObject_CallMethodObjArgs` is a faster alternative."
475474
msgstr ""
476475

@@ -481,8 +480,8 @@ msgstr ""
481480
#: ../../c-api/call.rst:316
482481
msgid ""
483482
"Call a callable Python object *callable*, with a variable number of :c:type:"
484-
"`PyObject *` arguments. The arguments are provided as a variable number of "
485-
"parameters followed by *NULL*."
483+
"`PyObject \\*` arguments. The arguments are provided as a variable number "
484+
"of parameters followed by *NULL*."
486485
msgstr ""
487486

488487
#: ../../c-api/call.rst:323
@@ -495,7 +494,7 @@ msgstr ""
495494
msgid ""
496495
"Call a method of the Python object *obj*, where the name of the method is "
497496
"given as a Python string object in *name*. It is called with a variable "
498-
"number of :c:type:`PyObject *` arguments. The arguments are provided as a "
497+
"number of :c:type:`PyObject \\*` arguments. The arguments are provided as a "
499498
"variable number of parameters followed by *NULL*."
500499
msgstr ""
501500

0 commit comments

Comments
 (0)