Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 618422f

Browse filesBrowse files
committed
Merge po files from upstream
1 parent 642e8e9 commit 618422f
Copy full SHA for 618422f
Expand file treeCollapse file tree

22 files changed

+1882
-1825
lines changed

‎c-api/marshal.po

Copy file name to clipboardExpand all lines: c-api/marshal.po
+14-21Lines changed: 14 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: 2018-06-26 18:54+0800\n"
10+
"POT-Creation-Date: 2018-08-07 14:20+0800\n"
1111
"PO-Revision-Date: 2018-05-23 14:06+0000\n"
1212
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -66,47 +66,40 @@ msgstr ""
6666
msgid "The following functions allow marshalled values to be read back in."
6767
msgstr ""
6868

69-
#: ../../c-api/marshal.rst:43
70-
msgid ""
71-
"XXX What about error detection? It appears that reading past the end of the "
72-
"file will always result in a negative numeric value (where that's relevant), "
73-
"but it's not clear that negative values won't be handled properly when "
74-
"there's no error. What's the right way to tell? Should only non-negative "
75-
"values be written using these routines?"
76-
msgstr ""
77-
78-
#: ../../c-api/marshal.rst:52
69+
#: ../../c-api/marshal.rst:46
7970
msgid ""
8071
"Return a C :c:type:`long` from the data stream in a :c:type:`FILE\\*` opened "
8172
"for reading. Only a 32-bit value can be read in using this function, "
8273
"regardless of the native size of :c:type:`long`."
8374
msgstr ""
8475

85-
#: ../../c-api/marshal.rst:56 ../../c-api/marshal.rst:65
86-
msgid "On error, raise an exception and return ``-1``."
76+
#: ../../c-api/marshal.rst:50 ../../c-api/marshal.rst:60
77+
msgid ""
78+
"On error, sets the appropriate exception (:exc:`EOFError`) and returns "
79+
"``-1``."
8780
msgstr ""
8881

89-
#: ../../c-api/marshal.rst:61
82+
#: ../../c-api/marshal.rst:56
9083
msgid ""
9184
"Return a C :c:type:`short` from the data stream in a :c:type:`FILE\\*` "
9285
"opened for reading. Only a 16-bit value can be read in using this function, "
9386
"regardless of the native size of :c:type:`short`."
9487
msgstr ""
9588

96-
#: ../../c-api/marshal.rst:70
89+
#: ../../c-api/marshal.rst:66
9790
msgid ""
9891
"Return a Python object from the data stream in a :c:type:`FILE\\*` opened "
9992
"for reading."
10093
msgstr ""
10194

102-
#: ../../c-api/marshal.rst:73 ../../c-api/marshal.rst:87
103-
#: ../../c-api/marshal.rst:96
95+
#: ../../c-api/marshal.rst:69 ../../c-api/marshal.rst:83
96+
#: ../../c-api/marshal.rst:92
10497
msgid ""
105-
"On error, sets the appropriate exception (:exc:`EOFError` or :exc:"
106-
"`TypeError`) and returns *NULL*."
98+
"On error, sets the appropriate exception (:exc:`EOFError`, :exc:`ValueError` "
99+
"or :exc:`TypeError`) and returns *NULL*."
107100
msgstr ""
108101

109-
#: ../../c-api/marshal.rst:79
102+
#: ../../c-api/marshal.rst:75
110103
msgid ""
111104
"Return a Python object from the data stream in a :c:type:`FILE\\*` opened "
112105
"for reading. Unlike :c:func:`PyMarshal_ReadObjectFromFile`, this function "
@@ -117,7 +110,7 @@ msgid ""
117110
"anything else from the file."
118111
msgstr ""
119112

120-
#: ../../c-api/marshal.rst:93
113+
#: ../../c-api/marshal.rst:89
121114
msgid ""
122115
"Return a Python object from the data stream in a byte buffer containing "
123116
"*len* bytes pointed to by *data*."

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.