merge

schema.py

-from yams.buildobjs import EntityType, RelationType, String, Boolean
-
-try:
-    from yams.buildobjs import RichString
-except ImportError:
-    from cubicweb.schema import RichString
-
+from yams.buildobjs import EntityType, RelationType, String, Boolean, RichString
 _ = unicode
 
 class Link(EntityType):
@@ -17,7 +11,6 @@
     description = RichString(fulltextindexed=True,
                          description=_("description of the linked page's content"))
 
-
 class embed(RelationType):
     __permissions__ = {'read': ('managers', 'users', 'guests'),
                        'delete': ('managers',),