summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorGiampaolo Rodola' <g.rodola@gmail.com>2012-05-16 14:03:07 (GMT)
committerGiampaolo Rodola' <g.rodola@gmail.com>2012-05-16 14:03:07 (GMT)
commit26fd8feb5e96276bc99d5682865d34deb190b731 (patch)
treecfef5fe0375c28cacbcc6228113c4baadbdd317c /Python
parente1266782160b0eef3726658480b83fa9fbcb6f0e (diff)
parent7ca29507f69d6b35cd697f533bc754a7864e6292 (diff)
downloadcpython-26fd8feb5e96276bc99d5682865d34deb190b731.zip
cpython-26fd8feb5e96276bc99d5682865d34deb190b731.tar.gz
cpython-26fd8feb5e96276bc99d5682865d34deb190b731.tar.bz2
merge heads
Diffstat (limited to 'Python')
-rw-r--r--Python/freeze_importlib.py2
-rw-r--r--Python/importlib.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/Python/freeze_importlib.py b/Python/freeze_importlib.py
index c012722..b96e7f2 100644
--- a/Python/freeze_importlib.py
+++ b/Python/freeze_importlib.py
@@ -25,6 +25,8 @@ def main(input_path, output_path):
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')
if __name__ == '__main__':
diff --git a/Python/importlib.h b/Python/importlib.h
index 0beeb59..cf5619a 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -3029,4 +3029,4 @@ unsigned char _Py_M__importlib[] = {
12,17,6,2,12,47,18,25,12,23,12,15,24,30,6,1,
6,3,12,54,
};
-/* Mercurial binary marker:
+/* Mercurial binary marker: