Merge lp:~cassidy/moovida/moovida-escape-uri into lp:moovida

[Guillaume Desmottes]

[Olivier Tilloy (osomon)]

The issue was fixed with a different approach (see bug #491874).

review: Disapprove

Unmerged revisions

1608. By Guillaume Desmottes on 2010-01-03

Don't escape reserved characters in URI (#502488)

=== modified file 'elisa-plugins/elisa/plugins/gstreamer/decodebin2_pipeline.py'
--- elisa-plugins/elisa/plugins/gstreamer/decodebin2_pipeline.py	2009-11-13 18:24:48 +0000
+++ elisa-plugins/elisa/plugins/gstreamer/decodebin2_pipeline.py	2010-01-03 01:40:29 +0000
@@ -675,7 +675,7 @@
         self.debug('unknown pad %s, caps %s' % (pad, caps))
 
     def _plug_src(self, uri):
-        quoted_uri = quote(uri, '/:')
+        quoted_uri = quote(uri, ';/?:@&=+$,')
         src = gst.element_make_from_uri(gst.URI_SRC, quoted_uri)
         # FIXME: workaround for jpegdec that does a gst_buffer_join for each
         # gst_pad_chain.
 
=== modified file 'elisa-plugins/elisa/plugins/gstreamer/old_pipeline.py'
--- elisa-plugins/elisa/plugins/gstreamer/old_pipeline.py	2009-11-13 18:24:48 +0000
+++ elisa-plugins/elisa/plugins/gstreamer/old_pipeline.py	2010-01-03 01:40:29 +0000
@@ -541,7 +541,7 @@
         self.debug('unknown pad %s, caps %s' % (pad, caps))
 
     def _plug_src(self, uri):
-        quoted_uri = quote(uri, '/:')
+        quoted_uri = quote(uri, ';/?:@&=+$,')
         src = gst.element_make_from_uri(gst.URI_SRC, quoted_uri)
         # FIXME: workaround for jpegdec that does a gst_buffer_join for each
         # gst_pad_chain.
 
=== modified file 'elisa-plugins/elisa/plugins/poblesec/player_video.py'
--- elisa-plugins/elisa/plugins/poblesec/player_video.py	2009-12-01 12:16:26 +0000
+++ elisa-plugins/elisa/plugins/poblesec/player_video.py	2010-01-03 01:40:29 +0000
@@ -695,7 +695,7 @@
                     unicode_uri = unicode(file_uri)
                     sub_uri = \
                         unicode_uri.encode(locale_helper.gst_file_encoding())
-                    quoted_sub_uri = quote(sub_uri, '/:')
+                    quoted_sub_uri = quote(sub_uri, ';/?:@&=+$,')
                     self.pipeline.set_property('suburi', quoted_sub_uri)
                     self.info("Loaded subtitles at %r", sub_uri)
                     found = True
@@ -808,7 +808,7 @@
         self.filename = model.title or model.uri.filename
         self.stop()
         uri = unicode(model.uri).encode(locale_helper.gst_file_encoding())
-        quoted_uri = quote(uri, '/:')
+        quoted_uri = quote(uri, ';/?:@&=+$,')
         self.pipeline.set_property('uri', quoted_uri)
         self._load_subs(model.uri)