Merge tag 'upstream/2017.03.07'

[youtubedl] / devscripts / gh-pages / update-copyright.py

diff --git a/devscripts/gh-pages/update-copyright.py b/devscripts/gh-pages/update-copyright.py
index 12c2a91949135d72edf53e41d15ae532690bc6bf..e6c3abc8d8c716db6adbb62598a9d9179fcaa2da 100755 (executable)
--- a/devscripts/gh-pages/update-copyright.py
+++ b/devscripts/gh-pages/update-copyright.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 # coding: utf-8
 
 #!/usr/bin/env python
 # coding: utf-8
 

-from __future__ import with_statement
+from __future__ import with_statement, unicode_literals

 
 import datetime
 import glob
 
 import datetime
 import glob

-import io # For Python 2 compatibilty
+import io  # For Python 2 compatibility

 import os
 import re
 
 import os
 import re
 


@@ -13,7 +13,7 @@ year = str(datetime.datetime.now().year)
 for fn in glob.glob('*.html*'):
     with io.open(fn, encoding='utf-8') as f:
         content = f.read()
 for fn in glob.glob('*.html*'):
     with io.open(fn, encoding='utf-8') as f:
         content = f.read()

-    newc = re.sub(u'(?P<copyright>Copyright © 2006-)(?P<year>[0-9]{4})', u'Copyright © 2006-' + year, content)
+    newc = re.sub(r'(?P<copyright>Copyright © 2006-)(?P<year>[0-9]{4})', 'Copyright © 2006-' + year, content)

     if content != newc:
         tmpFn = fn + '.part'
         with io.open(tmpFn, 'wt', encoding='utf-8') as outf:
     if content != newc:
         tmpFn = fn + '.part'
         with io.open(tmpFn, 'wt', encoding='utf-8') as outf: