ECHO_content/ECHO_helpers.py - diff

Return to ECHO_helpers.py CVS log

Up to [Repository] / ECHO_content

-version 1.82, 2007/05/03 14:23:46
+version 1.84, 2007/07/24 09:11:46
  Line 35  def encodeRPC(string):
  def decodeRPC(string):
      return bz2.decompress(base64.decodestring(string))
+ def unicodify(s):
+     """decode str (utf-8 or latin-1 representation) into unicode object"""
+     if not s:
+         return u""
+     if isinstance(s, str):
+         try:
+             return s.decode('utf-8')
+         except:
+             return s.decode('latin-1')
+     else:
+         return s
+ def utf8ify(s):
+     """encode unicode object or string into byte string in utf-8 representation.
+        assumes string objects to be utf-8"""
+     if not s:
+         return ""
+     if isinstance(s, str):
+         return s
+     else:
+         return s.encode('utf-8')
  def content_html(self,type):
          """template fuer content"""
          #templates = self.ZopeFind(self.aq_parent,obj_ids=[type+"_template"])
- Line 1220  class MapText(Folder,ZopePageTemplate):
+ Line 1243  class MapText(Folder,ZopePageTemplate):
          self.ZBindings_edit(self._default_bindings)
          if text is None:
              text = open(self._default_content_fn).read()
+         if content_type is None:
+             content_type = self.content_type
          self.pt_edit(text, content_type)
      def createLocale(self):