w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove ur references for Python 3.3 support

Browse source
This commit is contained in:
Philipp Hagemeister 2012-11-27 23:56:10 +01:00
parent 01ba00ca42
commit 89fb51dd2d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
youtube_dl/FileDownloader.py
View file

@ -201,7 +201,7 @@ class FileDownloader(object):
def fixed_template(self): def fixed_template(self):
"""Checks if the output template is fixed.""" """Checks if the output template is fixed."""
return (re.search(ur'(?u)%\(.+?\)s', self.params['outtmpl']) is None) return (re.search(u'(?u)%\\(.+?\\)s', self.params['outtmpl']) is None)
def trouble(self, message=None): def trouble(self, message=None):
"""Determine action to take when a download problem appears. """Determine action to take when a download problem appears.

6
youtube_dl/utils.py
View file

@ -77,7 +77,7 @@ def htmlentity_transform(matchobj):
if entity in htmlentitydefs.name2codepoint: if entity in htmlentitydefs.name2codepoint:
return unichr(htmlentitydefs.name2codepoint[entity]) return unichr(htmlentitydefs.name2codepoint[entity])
mobj = re.match(ur'(?u)#(x?\d+)', entity) mobj = re.match(u'(?u)#(x?\\d+)', entity)
if mobj is not None: if mobj is not None:
numstr = mobj.group(1) numstr = mobj.group(1)
if numstr.startswith(u'x'): if numstr.startswith(u'x'):
@ -198,7 +198,7 @@ def sanitize_open(filename, open_mode):
return (stream, filename) return (stream, filename)
except (IOError, OSError) as err: except (IOError, OSError) as err:
# In case of error, try to remove win32 forbidden chars # In case of error, try to remove win32 forbidden chars
filename = re.sub(ur'[/<>:"\|\?\*]', u'#', filename) filename = re.sub(u'[/<>:"\\|\\\\?\\*]', u'#', filename)
# An exception here should be caught in the caller # An exception here should be caught in the caller
stream = open(encodeFilename(filename), open_mode) stream = open(encodeFilename(filename), open_mode)
@ -257,7 +257,7 @@ def unescapeHTML(s):
""" """
assert type(s) == type(u'') assert type(s) == type(u'')
result = re.sub(ur'(?u)&(.+?);', htmlentity_transform, s) result = re.sub(u'(?u)&(.+?);', htmlentity_transform, s)
return result return result
def encodeFilename(s): def encodeFilename(s):