Reviewed-by: Gonzalo Odiard <<a href="mailto:gonzalo@laptop.org">gonzalo@laptop.org</a>><br><br><div class="gmail_quote">On Wed, Jan 11, 2012 at 1:43 PM, Simon Schampijer <span dir="ltr"><<a href="mailto:simon@schampijer.de">simon@schampijer.de</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">- removed deprecated mime type 'application/vnd.olpc-x-sugar'<br>
- <a href="http://activity.info" target="_blank">activity.info</a> file: removed deprecated field 'service_name' use 'bundle_id' instead<br>
- <a href="http://activity.info" target="_blank">activity.info</a> file: removed deprecated field 'class' use 'exec' instead<br>
<br>
Signed-off-by: Simon Schampijer <<a href="mailto:simon@laptop.org">simon@laptop.org</a>><br>
---<br>
src/sugar3/bundle/activitybundle.py | 13 +------------<br>
1 files changed, 1 insertions(+), 12 deletions(-)<br>
<br>
diff --git a/src/sugar3/bundle/activitybundle.py b/src/sugar3/bundle/activitybundle.py<br>
index 206c4fb..2313f41 100644<br>
--- a/src/sugar3/bundle/activitybundle.py<br>
+++ b/src/sugar3/bundle/activitybundle.py<br>
@@ -43,7 +43,6 @@ class ActivityBundle(Bundle):<br>
"""<br>
<br>
MIME_TYPE = 'application/vnd.olpc-sugar'<br>
- DEPRECATED_MIME_TYPE = 'application/vnd.olpc-x-sugar'<br>
<br>
_zipped_extension = '.xo'<br>
_unzipped_extension = '.activity'<br>
@@ -84,11 +83,6 @@ class ActivityBundle(Bundle):<br>
<br>
if cp.has_option(section, 'bundle_id'):<br>
self._bundle_id = cp.get(section, 'bundle_id')<br>
- # FIXME deprecated<br>
- elif cp.has_option(section, 'service_name'):<br>
- warnings.warn('use bundle_id instead of service_name ' \<br>
- 'in your <a href="http://activity.info" target="_blank">activity.info</a>', DeprecationWarning)<br>
- self._bundle_id = cp.get(section, 'service_name')<br>
else:<br>
raise MalformedBundleException(<br>
'Activity bundle %s does not specify a bundle id' %<br>
@@ -100,12 +94,7 @@ class ActivityBundle(Bundle):<br>
raise MalformedBundleException(<br>
'Activity bundle %s does not specify a name' % self._path)<br>
<br>
- # FIXME class is deprecated<br>
- if cp.has_option(section, 'class'):<br>
- warnings.warn('use exec instead of class ' \<br>
- 'in your <a href="http://activity.info" target="_blank">activity.info</a>', DeprecationWarning)<br>
- self.activity_class = cp.get(section, 'class')<br>
- elif cp.has_option(section, 'exec'):<br>
+ if cp.has_option(section, 'exec'):<br>
self.bundle_exec = cp.get(section, 'exec')<br>
else:<br>
raise MalformedBundleException(<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.7.5<br>
<br>
_______________________________________________<br>
Sugar-devel mailing list<br>
<a href="mailto:Sugar-devel@lists.sugarlabs.org">Sugar-devel@lists.sugarlabs.org</a><br>
<a href="http://lists.sugarlabs.org/listinfo/sugar-devel" target="_blank">http://lists.sugarlabs.org/listinfo/sugar-devel</a><br>
</font></span></blockquote></div><br>