[CalendarServer-changes] [14900] CalendarServer/branches/users/cdaboo/cfod

[source_changes at macosforge.org]

Revision: 14900
          http://trac.calendarserver.org//changeset/14900
Author:   cdaboo at apple.com
Date:     2015-06-18 08:00:11 -0700 (Thu, 18 Jun 2015)
Log Message:
-----------
Checkpoint of cffi/OD work.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/cfod/calendarserver/webcal/resource.py
    CalendarServer/branches/users/cdaboo/cfod/requirements-stable.txt
    CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/localization.py

Modified: CalendarServer/branches/users/cdaboo/cfod/calendarserver/webcal/resource.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/calendarserver/webcal/resource.py	2015-06-18 14:58:26 UTC (rev 14899)
+++ CalendarServer/branches/users/cdaboo/cfod/calendarserver/webcal/resource.py	2015-06-18 15:00:11 UTC (rev 14900)
@@ -201,10 +201,13 @@
 
 
 try:
-    from Foundation import NSTimeZone
+    from twext.platform.osx.utils import CFTimeZoneRef
 
     def lookupSystemTimezone():
-        return NSTimeZone.localTimeZone().name().encode("utf-8")
+        try:
+            return CFTimeZoneRef.defaultTimeZoneName()
+        except:
+            return ""
 
 except ImportError:
     def lookupSystemTimezone():

Modified: CalendarServer/branches/users/cdaboo/cfod/requirements-stable.txt
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/requirements-stable.txt	2015-06-18 14:58:26 UTC (rev 14899)
+++ CalendarServer/branches/users/cdaboo/cfod/requirements-stable.txt	2015-06-18 15:00:11 UTC (rev 14900)
@@ -36,7 +36,7 @@
             #pyOpenSSL
         pycrypto==2.6.1
 
-    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14808#egg=twextpy
+    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/branches/users/cdaboo/cfod@14899#egg=twextpy
         cffi==1.1.0
             pycparser==2.13
         #twisted
@@ -48,9 +48,6 @@
         # [DAL] extra
               sqlparse==0.1.14  # Compat issue in 0.1.15; fix before updating
 
-        # [OpenDirectory] extra
-            #pyobjc-framework-OpenDirectory  # Use system module
-
         # [Postgres] extra
             pg8000==1.10.2
 

Modified: CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/localization.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/localization.py	2015-06-18 14:58:26 UTC (rev 14899)
+++ CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/localization.py	2015-06-18 15:00:11 UTC (rev 14900)
@@ -24,12 +24,12 @@
 from locale import normalize
 
 from twext.python.log import Logger
+
 from pycalendar.duration import Duration
 
 try:
-    from Foundation import (
-        NSPropertyListImmutable, NSPropertyListSerialization, NSData, NSLocale
-    )
+    from twext.platform.osx.corefoundation import CFError
+    from twext.platform.osx.utils import CFLocaleRef, CFDataRef, CFPropertyListRef
     foundationImported = True
 except ImportError:
     foundationImported = False
@@ -444,16 +444,16 @@
             return
 
     # Parse the binary plist .strings file:
-    parser = NSPropertyListSerialization.propertyListFromData_mutabilityOption_format_errorDescription_
-    data = NSData.dataWithContentsOfMappedFile_(src)
-    strings, format, error = parser(data, NSPropertyListImmutable, None, None)
-    if error:
+    data = CFDataRef.fromString(open(src).read())
+    try:
+        parsed = CFPropertyListRef.createFromData(data)
+        strings = parsed.toDict()
+    except CFError as error:
         raise ParseError(error)
 
     # The format of GNUtext MO files is described here:
     # http://www.gnu.org/software/autoconf/manual/gettext/MO-Files.html
 
-    strings = dict(strings)
     originals = strings.keys()
     originals.sort()
 
@@ -538,7 +538,7 @@
         return config.Localization.Language
 
     try:
-        language = NSLocale.preferredLanguages()[0]
+        language = CFLocaleRef.preferredLanguages()[0]
         language = _remapLanguageCode(language)
     except:
         language = "en"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150618/12518a17/attachment.html>