Merge tag 'upstream/2014.07.11'

[youtubedl] / devscripts / make_readme.py

diff --git a/devscripts/make_readme.py b/devscripts/make_readme.py
index 7f2ea319cca5c7c3433665c534758e93fedf8f89..70fa942dd12f7a75ee71b1fc9668e615cda0d747 100755 (executable)
--- a/devscripts/make_readme.py
+++ b/devscripts/make_readme.py
@@ -1,20 +1,24 @@
+import io

 import sys
 import re
 
 README_FILE = 'README.md'
 helptext = sys.stdin.read()
 
 import sys
 import re
 
 README_FILE = 'README.md'
 helptext = sys.stdin.read()
 

-with open(README_FILE) as f:
+if isinstance(helptext, bytes):
+    helptext = helptext.decode('utf-8')
+
+with io.open(README_FILE, encoding='utf-8') as f:

     oldreadme = f.read()
 
 header = oldreadme[:oldreadme.index('# OPTIONS')]
 footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
 
     oldreadme = f.read()
 
 header = oldreadme[:oldreadme.index('# OPTIONS')]
 footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
 

-options = helptext[helptext.index('  General Options:')+19:]
-options = re.sub(r'^  (\w.+)$', r'## \1', options, flags=re.M)
+options = helptext[helptext.index('  General Options:') + 19:]
+options = re.sub(r'(?m)^  (\w.+)$', r'## \1', options)

 options = '# OPTIONS\n' + options + '\n'
 
 options = '# OPTIONS\n' + options + '\n'
 

-with open(README_FILE, 'w') as f:
+with io.open(README_FILE, 'w', encoding='utf-8') as f:

     f.write(header)
     f.write(options)
     f.write(footer)
     f.write(header)
     f.write(options)
     f.write(footer)