Remove ur references for Python 3.3 support

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index 89beaf4538dbc36e62fe1aed823bb25e0c1ecf34..868023db9f2d1233ed96ac680a8b0966336f27ef 100644 (file)
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -201,7 +201,7 @@ class FileDownloader(object):
 
        def fixed_template(self):
                """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):
                """Determine action to take when a download problem appears.

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 12e32be981b1a1e317888e2f179065ff4d00a132..ccefc66a089c4b1c118651d36aefa7e7ba304a28 100644 (file)
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -77,7 +77,7 @@ def htmlentity_transform(matchobj):
        if entity in htmlentitydefs.name2codepoint:
                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:
                numstr = mobj.group(1)
                if numstr.startswith(u'x'):
@@ -198,7 +198,7 @@ def sanitize_open(filename, open_mode):
                return (stream, filename)
        except (IOError, OSError) as err:
                # 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
                stream = open(encodeFilename(filename), open_mode)
@@ -257,7 +257,7 @@ def unescapeHTML(s):
        """
        assert type(s) == type(u'')
 
-       result = re.sub(ur'(?u)&(.+?);', htmlentity_transform, s)
+       result = re.sub(u'(?u)&(.+?);', htmlentity_transform, s)
        return result
 
 def encodeFilename(s):