Movatterモバイル変換


[0]ホーム

URL:


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

Sign up
Appearance settings

gh-133319: Use python versioning inmsgfmt &pygettext#134205

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
StanFromIreland wants to merge2 commits intopython:main
base:main
Choose a base branch
Loading
fromStanFromIreland:pyver-get-msg
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletionLib/test/test_tools/i18n_data/ascii-escapes.pot
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py1.5\n"
"Generated-By: pygettext.py3.15\n"


#. Special characters that are always escaped in the POT file
Expand Down
2 changes: 1 addition & 1 deletionLib/test/test_tools/i18n_data/comments.pot
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py1.5\n"
"Generated-By: pygettext.py3.15\n"


#: comments.py:4
Expand Down
2 changes: 1 addition & 1 deletionLib/test/test_tools/i18n_data/custom_keywords.pot
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py1.5\n"
"Generated-By: pygettext.py3.15\n"


#: custom_keywords.py:10 custom_keywords.py:11
Expand Down
2 changes: 1 addition & 1 deletionLib/test/test_tools/i18n_data/docstrings.pot
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py1.5\n"
"Generated-By: pygettext.py3.15\n"


#: docstrings.py:1
Expand Down
2 changes: 1 addition & 1 deletionLib/test/test_tools/i18n_data/escapes.pot
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py1.5\n"
"Generated-By: pygettext.py3.15\n"


#. Special characters that are always escaped in the POT file
Expand Down
2 changes: 1 addition & 1 deletionLib/test/test_tools/i18n_data/fileloc.pot
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py1.5\n"
"Generated-By: pygettext.py3.15\n"


#: fileloc.py:5 fileloc.py:6
Expand Down
2 changes: 1 addition & 1 deletionLib/test/test_tools/i18n_data/messages.pot
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py1.5\n"
"Generated-By: pygettext.py3.15\n"


#: messages.py:16
Expand Down
2 changes: 1 addition & 1 deletionLib/test/test_tools/i18n_data/multiple_keywords.pot
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py1.5\n"
"Generated-By: pygettext.py3.15\n"


#: multiple_keywords.py:3
Expand Down
2 changes: 1 addition & 1 deletionLib/test/test_tools/test_msgfmt.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -253,7 +253,7 @@ def test_version(self):
for option in ('--version', '-V'):
res = assert_python_ok(msgfmt_py, option)
out = res.out.decode('utf-8').strip()
self.assertEqual('msgfmt.py1.2', out)
self.assertRegex(out, r'^msgfmt\.py\d+\.\d+$')

def test_invalid_option(self):
res = assert_python_failure(msgfmt_py, '--invalid-option')
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
Use Python versioning in :program:`msgfmt` and :program:`pygettext`.
2 changes: 1 addition & 1 deletionTools/i18n/msgfmt.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
from email.parser import HeaderParser
import codecs

__version__ = "1.2"
__version__ = "3.15"


MESSAGES = {}
Expand Down
4 changes: 2 additions & 2 deletionsTools/i18n/pygettext.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@
from io import BytesIO
from operator import itemgetter

__version__ = '1.5'
__version__ = '3.15'


# The normal pot-file header. msgmerge and Emacs's po-mode work better if it's
Expand DownExpand Up@@ -387,7 +387,7 @@ def unparse_spec(name, spec):
parts.append(f'{pos + 1}c')
else:
parts.append(str(pos + 1))
return f'{name}:{','.join(parts)}'
return f'{name}:{",".join(parts)}'


def process_keywords(keywords, *, no_default_keywords):
Expand Down
Loading

[8]ページ先頭

©2009-2025 Movatter.jp