Cleanup Exceptions

[mpd-sima.git] / sima / lib / meta.py

diff --git a/sima/lib/meta.py b/sima/lib/meta.py
index 725bfb00afde57b80d4caf39acb9e1968ca394ab..9e858a2bc972ffc1ef557bc27c41beb6f37cbf60 100644 (file)
--- a/sima/lib/meta.py
+++ b/sima/lib/meta.py
@@ -61,8 +61,8 @@ def serialize(func):
     def wrapper(*args, **kwargs):
         ans = func(*args, **kwargs)
         if isinstance(ans, set):
-            return {s.replace("'", r"\'") for s in ans}
-        return ans.replace("'", r"\'")
+            return {s.replace("'", r"\'").replace('"', r'\"') for s in ans}
+        return ans.replace("'", r"\'").replace('"', r'\"')
     return wrapper
 
 
@@ -136,12 +136,12 @@ class Meta:
 
         :param str other: Alias to add, could be any object with ``__str__`` method.
         """
+        if isinstance(other, Meta):
+            self.__aliases |= other.__aliases
+            self.__aliases -= {self.name}
         if getattr(other, '__str__', None):
             if callable(other.__str__) and other.__str__() != self.name:
                 self.__aliases |= {other.__str__()}
-        elif isinstance(other, Meta):
-            if other.name != self.name:
-                self.__aliases |= other.__aliases
         else:
             raise MetaException('No __str__ method found in {!r}'.format(other))