[CalendarServer-changes] [13912] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 13912
          http://trac.calendarserver.org//changeset/13912
Author:   sagen at apple.com
Date:     2014-08-21 11:45:59 -0700 (Thu, 21 Aug 2014)
Log Message:
-----------
Move sacl to twext.python

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/provision/root.py
    CalendarServer/trunk/requirements-stable.txt
    CalendarServer/trunk/setup.py

Removed Paths:
-------------
    CalendarServer/trunk/calendarserver/platform/

Modified: CalendarServer/trunk/calendarserver/provision/root.py
===================================================================
--- CalendarServer/trunk/calendarserver/provision/root.py	2014-08-21 18:45:29 UTC (rev 13911)
+++ CalendarServer/trunk/calendarserver/provision/root.py	2014-08-21 18:45:59 UTC (rev 13912)
@@ -20,7 +20,7 @@
 ]
 
 try:
-    from calendarserver.platform.darwin.sacl import checkSACL
+    from twext.python.sacl import checkSACL
 except ImportError:
     # OS X Server SACLs not supported on this system, make SACL check a no-op
     checkSACL = lambda *ignored: True

Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt	2014-08-21 18:45:29 UTC (rev 13911)
+++ CalendarServer/trunk/requirements-stable.txt	2014-08-21 18:45:59 UTC (rev 13912)
@@ -5,7 +5,7 @@
 # For CalendarServer development, don't try to get these projects from PyPI; use svn.
 
 -e .
--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13907#egg=twextpy
+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13911#egg=twextpy
 -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
 -e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@13802#egg=pycalendar
 

Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py	2014-08-21 18:45:29 UTC (rev 13911)
+++ CalendarServer/trunk/setup.py	2014-08-21 18:45:59 UTC (rev 13912)
@@ -23,7 +23,6 @@
 import errno
 import os
 import subprocess
-import sys
 
 
 #
@@ -265,15 +264,7 @@
 
 extensions = []
 
-if sys.platform == "darwin":
-    try:
-        from calendarserver.platform.darwin import sacl
-        extensions.append(sacl.ffi.verifier.get_extension())
-    except ImportError:
-        pass
 
-
-
 #
 # Run setup
 #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140821/fb336ebd/attachment-0001.html>