From 1d25b6f04a0afee3a1c110ec18097351e07a0608 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 19 Jun 2012 16:33:39 +0200 Subject: Issue #15103: remove the NUL character (serving as a Mercurial binary marker) from Python/importlib.h. Instead the email notification hook uses a configuration option to omit importlib.h diffs. --- Python/freeze_importlib.py | 1 - Python/importlib.h | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Python/freeze_importlib.py b/Python/freeze_importlib.py index b96e7f2..14a044d 100644 --- a/Python/freeze_importlib.py +++ b/Python/freeze_importlib.py @@ -24,7 +24,6 @@ def main(input_path, output_path): lines.append('};\n') with open(output_path, 'w', encoding='utf-8') as output_file: output_file.write('\n'.join(lines)) - output_file.write('/* Mercurial binary marker: \x00 */') # Avoid a compiler warning for lack of EOL output_file.write('\n') diff --git a/Python/importlib.h b/Python/importlib.h index c9431e4..0b633ab 100644 --- a/Python/importlib.h +++ b/Python/importlib.h @@ -3047,7 +3047,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,4,0,0,0,19,0,0,0,115,46,0,0,0, 116,0,0,124,0,0,131,1,0,115,33,0,116,1,0,100, 1,0,100,2,0,124,0,0,131,1,1,130,1,0,110,0, - 0,136,1,0,124,0,0,136,0,0,140,1,0,83,40,3, + 0,136,0,0,124,0,0,136,1,0,140,1,0,83,40,3, 0,0,0,117,45,0,0,0,80,97,116,104,32,104,111,111, 107,32,102,111,114,32,105,109,112,111,114,116,108,105,98,46, 109,97,99,104,105,110,101,114,121,46,70,105,108,101,70,105, @@ -3057,9 +3057,9 @@ unsigned char _Py_M__importlib[] = { 104,40,2,0,0,0,117,11,0,0,0,95,112,97,116,104, 95,105,115,100,105,114,117,11,0,0,0,73,109,112,111,114, 116,69,114,114,111,114,40,1,0,0,0,117,4,0,0,0, - 112,97,116,104,40,2,0,0,0,117,14,0,0,0,108,111, - 97,100,101,114,95,100,101,116,97,105,108,115,117,3,0,0, - 0,99,108,115,40,0,0,0,0,117,29,0,0,0,60,102, + 112,97,116,104,40,2,0,0,0,117,3,0,0,0,99,108, + 115,117,14,0,0,0,108,111,97,100,101,114,95,100,101,116, + 97,105,108,115,40,0,0,0,0,117,29,0,0,0,60,102, 114,111,122,101,110,32,105,109,112,111,114,116,108,105,98,46, 95,98,111,111,116,115,116,114,97,112,62,117,24,0,0,0, 112,97,116,104,95,104,111,111,107,95,102,111,114,95,70,105, @@ -3072,9 +3072,9 @@ unsigned char _Py_M__importlib[] = { 0,99,108,115,117,14,0,0,0,108,111,97,100,101,114,95, 100,101,116,97,105,108,115,117,24,0,0,0,112,97,116,104, 95,104,111,111,107,95,102,111,114,95,70,105,108,101,70,105, - 110,100,101,114,40,0,0,0,0,40,2,0,0,0,117,14, - 0,0,0,108,111,97,100,101,114,95,100,101,116,97,105,108, - 115,117,3,0,0,0,99,108,115,117,29,0,0,0,60,102, + 110,100,101,114,40,0,0,0,0,40,2,0,0,0,117,3, + 0,0,0,99,108,115,117,14,0,0,0,108,111,97,100,101, + 114,95,100,101,116,97,105,108,115,117,29,0,0,0,60,102, 114,111,122,101,110,32,105,109,112,111,114,116,108,105,98,46, 95,98,111,111,116,115,116,114,97,112,62,117,9,0,0,0, 112,97,116,104,95,104,111,111,107,130,4,0,0,115,4,0, @@ -3844,4 +3844,4 @@ unsigned char _Py_M__importlib[] = { 19,129,19,13,12,9,12,17,12,17,6,2,12,46,12,13, 18,25,12,23,12,15,24,30,6,1,6,3,12,64, }; -/* Mercurial binary marker: */ + -- cgit v0.12