<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14900] CalendarServer/branches/users/cdaboo/cfod</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14900">14900</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-06-18 08:00:11 -0700 (Thu, 18 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Checkpoint of cffi/OD work.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboocfodcalendarserverwebcalresourcepy">CalendarServer/branches/users/cdaboo/cfod/calendarserver/webcal/resource.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboocfodrequirementsstabletxt">CalendarServer/branches/users/cdaboo/cfod/requirements-stable.txt</a></li>
<li><a href="#CalendarServerbranchesuserscdaboocfodtwistedcaldavlocalizationpy">CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/localization.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdaboocfodcalendarserverwebcalresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/cfod/calendarserver/webcal/resource.py (14899 => 14900)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -201,10 +201,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- from Foundation import NSTimeZone
</del><ins>+ from twext.platform.osx.utils import CFTimeZoneRef
</ins><span class="cx">
</span><span class="cx"> def lookupSystemTimezone():
</span><del>- return NSTimeZone.localTimeZone().name().encode("utf-8")
</del><ins>+ try:
+ return CFTimeZoneRef.defaultTimeZoneName()
+ except:
+ return ""
</ins><span class="cx">
</span><span class="cx"> except ImportError:
</span><span class="cx"> def lookupSystemTimezone():
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboocfodrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/cfod/requirements-stable.txt (14899 => 14900)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #pyOpenSSL
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14808#egg=twextpy
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/branches/users/cdaboo/cfod@14899#egg=twextpy
</ins><span class="cx"> cffi==1.1.0
</span><span class="cx"> pycparser==2.13
</span><span class="cx"> #twisted
</span><span class="lines">@@ -48,9 +48,6 @@
</span><span class="cx"> # [DAL] extra
</span><span class="cx"> sqlparse==0.1.14 # Compat issue in 0.1.15; fix before updating
</span><span class="cx">
</span><del>- # [OpenDirectory] extra
- #pyobjc-framework-OpenDirectory # Use system module
-
</del><span class="cx"> # [Postgres] extra
</span><span class="cx"> pg8000==1.10.2
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboocfodtwistedcaldavlocalizationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/localization.py (14899 => 14900)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -24,12 +24,12 @@
</span><span class="cx"> from locale import normalize
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><ins>+
</ins><span class="cx"> from pycalendar.duration import Duration
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- from Foundation import (
- NSPropertyListImmutable, NSPropertyListSerialization, NSData, NSLocale
- )
</del><ins>+ from twext.platform.osx.corefoundation import CFError
+ from twext.platform.osx.utils import CFLocaleRef, CFDataRef, CFPropertyListRef
</ins><span class="cx"> foundationImported = True
</span><span class="cx"> except ImportError:
</span><span class="cx"> foundationImported = False
</span><span class="lines">@@ -444,16 +444,16 @@
</span><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> # Parse the binary plist .strings file:
</span><del>- parser = NSPropertyListSerialization.propertyListFromData_mutabilityOption_format_errorDescription_
- data = NSData.dataWithContentsOfMappedFile_(src)
- strings, format, error = parser(data, NSPropertyListImmutable, None, None)
- if error:
</del><ins>+ data = CFDataRef.fromString(open(src).read())
+ try:
+ parsed = CFPropertyListRef.createFromData(data)
+ strings = parsed.toDict()
+ except CFError as error:
</ins><span class="cx"> raise ParseError(error)
</span><span class="cx">
</span><span class="cx"> # The format of GNUtext MO files is described here:
</span><span class="cx"> # http://www.gnu.org/software/autoconf/manual/gettext/MO-Files.html
</span><span class="cx">
</span><del>- strings = dict(strings)
</del><span class="cx"> originals = strings.keys()
</span><span class="cx"> originals.sort()
</span><span class="cx">
</span><span class="lines">@@ -538,7 +538,7 @@
</span><span class="cx"> return config.Localization.Language
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- language = NSLocale.preferredLanguages()[0]
</del><ins>+ language = CFLocaleRef.preferredLanguages()[0]
</ins><span class="cx"> language = _remapLanguageCode(language)
</span><span class="cx"> except:
</span><span class="cx"> language = "en"
</span></span></pre>
</div>
</div>
</body>
</html>