Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
f6595983
Commit
f6595983
authored
Mar 12, 2017
by
Serhiy Storchaka
Committed by
GitHub
Mar 12, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-28692: Deprecate using non-integer value for selecting a plural form in gettext. (#507)
parent
1989763f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
3 deletions
+17
-3
Doc/whatsnew/3.7.rst
Doc/whatsnew/3.7.rst
+4
-0
Lib/gettext.py
Lib/gettext.py
+4
-0
Lib/test/test_gettext.py
Lib/test/test_gettext.py
+6
-3
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Doc/whatsnew/3.7.rst
View file @
f6595983
...
@@ -180,6 +180,10 @@ Deprecated
...
@@ -180,6 +180,10 @@ Deprecated
both deprecated in Python 3.4 now emit :exc:`DeprecationWarning`. (Contributed
both deprecated in Python 3.4 now emit :exc:`DeprecationWarning`. (Contributed
by Matthias Bussonnier in :issue:`29576`)
by Matthias Bussonnier in :issue:`29576`)
- Using non-integer value for selecting a plural form in :mod:`gettext` is
now deprecated. It never correctly worked.
(Contributed by Serhiy Storchaka in :issue:`28692`.)
Removed
Removed
=======
=======
...
...
Lib/gettext.py
View file @
f6595983
...
@@ -164,6 +164,10 @@ def _as_int(n):
...
@@ -164,6 +164,10 @@ def _as_int(n):
except
TypeError
:
except
TypeError
:
raise
TypeError
(
'Plural value must be an integer, got %s'
%
raise
TypeError
(
'Plural value must be an integer, got %s'
%
(
n
.
__class__
.
__name__
,))
from
None
(
n
.
__class__
.
__name__
,))
from
None
import
warnings
warnings
.
warn
(
'Plural value must be an integer, got %s'
%
(
n
.
__class__
.
__name__
,),
DeprecationWarning
,
4
)
return
n
return
n
def
c2py
(
plural
):
def
c2py
(
plural
):
...
...
Lib/test/test_gettext.py
View file @
f6595983
...
@@ -443,9 +443,12 @@ class PluralFormsTestCase(GettextBaseTest):
...
@@ -443,9 +443,12 @@ class PluralFormsTestCase(GettextBaseTest):
f
=
gettext
.
c2py
(
'n != 1'
)
f
=
gettext
.
c2py
(
'n != 1'
)
self
.
assertEqual
(
f
(
1
),
0
)
self
.
assertEqual
(
f
(
1
),
0
)
self
.
assertEqual
(
f
(
2
),
1
)
self
.
assertEqual
(
f
(
2
),
1
)
self
.
assertEqual
(
f
(
1.0
),
0
)
with
self
.
assertWarns
(
DeprecationWarning
):
self
.
assertEqual
(
f
(
2.0
),
1
)
self
.
assertEqual
(
f
(
1.0
),
0
)
self
.
assertEqual
(
f
(
1.1
),
1
)
with
self
.
assertWarns
(
DeprecationWarning
):
self
.
assertEqual
(
f
(
2.0
),
1
)
with
self
.
assertWarns
(
DeprecationWarning
):
self
.
assertEqual
(
f
(
1.1
),
1
)
self
.
assertRaises
(
TypeError
,
f
,
'2'
)
self
.
assertRaises
(
TypeError
,
f
,
'2'
)
self
.
assertRaises
(
TypeError
,
f
,
b'2'
)
self
.
assertRaises
(
TypeError
,
f
,
b'2'
)
self
.
assertRaises
(
TypeError
,
f
,
[])
self
.
assertRaises
(
TypeError
,
f
,
[])
...
...
Misc/NEWS
View file @
f6595983
...
@@ -270,6 +270,9 @@ Extension Modules
...
@@ -270,6 +270,9 @@ Extension Modules
Library
Library
-------
-------
- bpo-28692: Using non-integer value for selecting a plural form in gettext is
now deprecated.
- bpo-26121: Use C library implementation for math functions:
- bpo-26121: Use C library implementation for math functions:
tgamma(), lgamma(), erf() and erfc().
tgamma(), lgamma(), erf() and erfc().
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment