Skip to content

Commit db6fb5a

Browse files
merge from the remote repo
2 parents 4bdd6e4 + 94cbe57 commit db6fb5a

4 files changed

Lines changed: 16 additions & 1 deletion

File tree

Doc/library/exceptions.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -897,6 +897,9 @@ The following exceptions are used as warning categories; see the
897897

898898
Base class for warnings about dubious syntax.
899899

900+
This warning is typically emitted when compiling Python source code, and usually won't be reported
901+
when running already compiled code.
902+
900903

901904
.. exception:: RuntimeWarning
902905

Doc/library/warnings.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ The following warnings category classes are currently defined:
8080
| | unless triggered by code in ``__main__``). |
8181
+----------------------------------+-----------------------------------------------+
8282
| :exc:`SyntaxWarning` | Base category for warnings about dubious |
83-
| | syntactic features. |
83+
| | syntactic features (typically emitted when |
84+
| | compiling Python source code, and hence |
85+
| | may not be suppressed by runtime filters) |
8486
+----------------------------------+-----------------------------------------------+
8587
| :exc:`RuntimeWarning` | Base category for warnings about dubious |
8688
| | runtime features. |

Lib/encodings/aliases.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@
318318
'iso_ir_157' : 'iso8859_10',
319319
'l6' : 'iso8859_10',
320320
'latin6' : 'iso8859_10',
321+
'latin_6' : 'iso8859_10',
321322

322323
# iso8859_11 codec
323324
'thai' : 'iso8859_11',
@@ -328,6 +329,7 @@
328329
'iso_8859_13' : 'iso8859_13',
329330
'l7' : 'iso8859_13',
330331
'latin7' : 'iso8859_13',
332+
'latin_7' : 'iso8859_13',
331333

332334
# iso8859_14 codec
333335
'iso_8859_14' : 'iso8859_14',
@@ -336,18 +338,21 @@
336338
'iso_ir_199' : 'iso8859_14',
337339
'l8' : 'iso8859_14',
338340
'latin8' : 'iso8859_14',
341+
'latin_8' : 'iso8859_14',
339342

340343
# iso8859_15 codec
341344
'iso_8859_15' : 'iso8859_15',
342345
'l9' : 'iso8859_15',
343346
'latin9' : 'iso8859_15',
347+
'latin_9' : 'iso8859_15',
344348

345349
# iso8859_16 codec
346350
'iso_8859_16' : 'iso8859_16',
347351
'iso_8859_16_2001' : 'iso8859_16',
348352
'iso_ir_226' : 'iso8859_16',
349353
'l10' : 'iso8859_16',
350354
'latin10' : 'iso8859_16',
355+
'latin_10' : 'iso8859_16',
351356

352357
# iso8859_2 codec
353358
'csisolatin2' : 'iso8859_2',
@@ -356,6 +361,7 @@
356361
'iso_ir_101' : 'iso8859_2',
357362
'l2' : 'iso8859_2',
358363
'latin2' : 'iso8859_2',
364+
'latin_2' : 'iso8859_2',
359365

360366
# iso8859_3 codec
361367
'csisolatin3' : 'iso8859_3',
@@ -364,6 +370,7 @@
364370
'iso_ir_109' : 'iso8859_3',
365371
'l3' : 'iso8859_3',
366372
'latin3' : 'iso8859_3',
373+
'latin_3' : 'iso8859_3',
367374

368375
# iso8859_4 codec
369376
'csisolatin4' : 'iso8859_4',
@@ -372,6 +379,7 @@
372379
'iso_ir_110' : 'iso8859_4',
373380
'l4' : 'iso8859_4',
374381
'latin4' : 'iso8859_4',
382+
'latin_4' : 'iso8859_4',
375383

376384
# iso8859_5 codec
377385
'csisolatincyrillic' : 'iso8859_5',
@@ -415,6 +423,7 @@
415423
'iso_ir_148' : 'iso8859_9',
416424
'l5' : 'iso8859_9',
417425
'latin5' : 'iso8859_9',
426+
'latin_5' : 'iso8859_9',
418427

419428
# johab codec
420429
'cp1361' : 'johab',
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
:mod:`!encodings.aliases`: Add ``latin_N`` aliases

0 commit comments

Comments
 (0)