[CalendarServer-changes] [3258] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Oct 29 11:08:05 PDT 2008
Revision: 3258
http://trac.macosforge.org/projects/calendarserver/changeset/3258
Author: wsanchez at apple.com
Date: 2008-10-29 11:08:04 -0700 (Wed, 29 Oct 2008)
Log Message:
-----------
Clean up plistlib imports
Modified Paths:
--------------
CalendarServer/trunk/bin/proxyclean
CalendarServer/trunk/contrib/SBS/bin/calendarServer_restore
CalendarServer/trunk/twistedcaldav/admin/formatters.py
CalendarServer/trunk/twistedcaldav/admin/logs.py
CalendarServer/trunk/twistedcaldav/backup.py
CalendarServer/trunk/twistedcaldav/config.py
CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
CalendarServer/trunk/twistedcaldav/directory/sudo.py
CalendarServer/trunk/twistedcaldav/directory/wiki.py
CalendarServer/trunk/twistedcaldav/py/plistlib.py
CalendarServer/trunk/twistedcaldav/test/test_config.py
CalendarServer/trunk/twistedcaldav/test/test_tap.py
Modified: CalendarServer/trunk/bin/proxyclean
===================================================================
--- CalendarServer/trunk/bin/proxyclean 2008-10-29 17:51:37 UTC (rev 3257)
+++ CalendarServer/trunk/bin/proxyclean 2008-10-29 18:08:04 UTC (rev 3258)
@@ -16,12 +16,17 @@
# limitations under the License.
##
-from plistlib import readPlist
import commands
import getopt
import os
import sys
+
try:
+ from plistlib import readPlist
+except ImportError:
+ from twistedcaldav.py.plistlib import readPlist
+
+try:
import opendirectory
import dsattributes
except ImportError:
Modified: CalendarServer/trunk/contrib/SBS/bin/calendarServer_restore
===================================================================
--- CalendarServer/trunk/contrib/SBS/bin/calendarServer_restore 2008-10-29 17:51:37 UTC (rev 3257)
+++ CalendarServer/trunk/contrib/SBS/bin/calendarServer_restore 2008-10-29 18:08:04 UTC (rev 3258)
@@ -18,8 +18,12 @@
import os
import sys
import fnmatch
-import plistlib
+try:
+ from plistlib import readPlist
+except ImportError:
+ from twistedcaldav.py.plistlib import readPlist
+
ServiceConf = "85-calendarServer.plist"
configFile = "/private/etc/caldavd/caldavd.plist"
@@ -40,10 +44,10 @@
def cleanDocRoot():
root = None
if os.path.exists(configFile):
- root = plistlib.readPlist(configFile)['DocumentRoot']
+ root = readPlist(configFile)['DocumentRoot']
if not root and os.path.exists(configFile + '.default'):
- root = plistlib.readPlist(configFile + '.default')['DocumentRoot']
+ root = readPlist(configFile + '.default')['DocumentRoot']
if not root:
root = documentRoot
Modified: CalendarServer/trunk/twistedcaldav/admin/formatters.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/formatters.py 2008-10-29 17:51:37 UTC (rev 3257)
+++ CalendarServer/trunk/twistedcaldav/admin/formatters.py 2008-10-29 18:08:04 UTC (rev 3258)
@@ -16,6 +16,11 @@
import sys
+try:
+ import plistlib
+except ImportError:
+ import twistedcaldav.py.plistlib
+
FORMATTERS = {}
def registerFormatter(formatter):
@@ -327,8 +332,6 @@
registerFormatter(CsvFormatter)
-import plistlib
-
class PlistFormatter(BaseFormatter):
name = "plist"
Modified: CalendarServer/trunk/twistedcaldav/admin/logs.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/logs.py 2008-10-29 17:51:37 UTC (rev 3257)
+++ CalendarServer/trunk/twistedcaldav/admin/logs.py 2008-10-29 18:08:04 UTC (rev 3258)
@@ -23,10 +23,14 @@
"""
import datetime
-import plistlib
import sys
import time
+try:
+ from plistlib import readPlist, writePlist
+except ImportError:
+ from twistedcaldav.py.plistlib import readPlist, writePlist
+
from twistedcaldav.admin import util
PLIST_VERSION = 4
@@ -58,7 +62,7 @@
self._data = None
if self.fp.exists() and append:
- self._data = plistlib.readPlist(self.fp.path)
+ self._data = readPlist(self.fp.path)
if self._data.version != PLIST_VERSION:
self._data = None
@@ -196,7 +200,7 @@
return self._data.activeUsers
def save(self):
- plistlib.writePlist(self._data, self.fp.path)
+ writePlist(self._data, self.fp.path)
NORMAL = 1
INDATE = 2
Modified: CalendarServer/trunk/twistedcaldav/backup.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/backup.py 2008-10-29 17:51:37 UTC (rev 3257)
+++ CalendarServer/trunk/twistedcaldav/backup.py 2008-10-29 18:08:04 UTC (rev 3258)
@@ -21,9 +21,13 @@
import os
import shutil
import fnmatch
-import plistlib
import commands
+try:
+ from plistlib import readPlist
+except ImportError:
+ from twistedcaldav.py.plistlib import readPlist
+
VERBOSE = os.environ.get('VERBOSE', False)
FUNCLOG = os.environ.get('FUNCLOG', False)
@@ -81,10 +85,10 @@
@logFuncCall
def readConfig(configFile):
- config = plistlib.readPlist(configFile + '.default')
+ config = readPlist(configFile + '.default')
if os.path.exists(configFile):
- config.update(plistlib.readPlist(configFile))
+ config.update(readPlist(configFile))
return config
Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py 2008-10-29 17:51:37 UTC (rev 3257)
+++ CalendarServer/trunk/twistedcaldav/config.py 2008-10-29 18:08:04 UTC (rev 3258)
@@ -18,10 +18,14 @@
import copy
import re
+try:
+ from plistlib import readPlist
+except ImportError:
+ from twistedcaldav.py.plistlib import readPlist
+
from twisted.web2.dav import davxml
from twisted.web2.dav.resource import TwistedACLInheritable
-from twistedcaldav.py.plistlib import readPlist
from twistedcaldav.log import Logger
from twistedcaldav.log import clearLogLevels, setLogLevelForNamespace, InvalidLogLevelError
Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2008-10-29 17:51:37 UTC (rev 3257)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2008-10-29 18:08:04 UTC (rev 3258)
@@ -27,6 +27,11 @@
from random import random
from uuid import UUID
+try:
+ from plistlib import readPlistFromString
+except ImportError:
+ from twistedcaldav.py.plistlib import readPlistFromString
+
import opendirectory
import dsattributes
import dsquery
@@ -39,8 +44,6 @@
from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
from twistedcaldav.directory.directory import DirectoryError, UnknownRecordTypeError
-from plistlib import readPlistFromString
-
class OpenDirectoryService(DirectoryService):
"""
Open Directory implementation of L{IDirectoryService}.
Modified: CalendarServer/trunk/twistedcaldav/directory/sudo.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/sudo.py 2008-10-29 17:51:37 UTC (rev 3257)
+++ CalendarServer/trunk/twistedcaldav/directory/sudo.py 2008-10-29 18:08:04 UTC (rev 3258)
@@ -30,7 +30,6 @@
from twisted.cred.error import UnauthorizedLogin
-from twistedcaldav.py.plistlib import readPlist
from twistedcaldav.directory.directory import (DirectoryService,
DirectoryRecord,
UnknownRecordTypeError)
Modified: CalendarServer/trunk/twistedcaldav/directory/wiki.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/wiki.py 2008-10-29 17:51:37 UTC (rev 3257)
+++ CalendarServer/trunk/twistedcaldav/directory/wiki.py 2008-10-29 18:08:04 UTC (rev 3258)
@@ -34,7 +34,6 @@
from twisted.web2.dav.resource import TwistedACLInheritable
from twistedcaldav.config import config
-from twistedcaldav.py.plistlib import readPlist
from twistedcaldav.directory.directory import (DirectoryService,
DirectoryRecord,
UnknownRecordTypeError)
Modified: CalendarServer/trunk/twistedcaldav/py/plistlib.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/py/plistlib.py 2008-10-29 17:51:37 UTC (rev 3257)
+++ CalendarServer/trunk/twistedcaldav/py/plistlib.py 2008-10-29 18:08:04 UTC (rev 3258)
@@ -1,3 +1,6 @@
+#
+# Added to standard library in Python 2.6 (Mac only in prior versions)
+#
"""plistlib.py -- a tool to generate and parse MacOSX .plist files.
The PropertList (.plist) file format is a simple XML pickle supporting
Modified: CalendarServer/trunk/twistedcaldav/test/test_config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_config.py 2008-10-29 17:51:37 UTC (rev 3257)
+++ CalendarServer/trunk/twistedcaldav/test/test_config.py 2008-10-29 18:08:04 UTC (rev 3258)
@@ -14,9 +14,13 @@
# limitations under the License.
##
+try:
+ from plistlib import writePlist
+except ImportError:
+ from twistedcaldav.py.plistlib import writePlist
+
from twisted.trial import unittest
-from twistedcaldav.py.plistlib import writePlist
from twistedcaldav.log import logLevelForNamespace
from twistedcaldav.config import config, defaultConfig, ConfigurationError
from twistedcaldav.static import CalDAVFile
Modified: CalendarServer/trunk/twistedcaldav/test/test_tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_tap.py 2008-10-29 17:51:37 UTC (rev 3257)
+++ CalendarServer/trunk/twistedcaldav/test/test_tap.py 2008-10-29 18:08:04 UTC (rev 3258)
@@ -17,6 +17,11 @@
import os
from copy import deepcopy
+try:
+ from plistlib import writePlist
+except ImportError:
+ from twistedcaldav.py.plistlib import writePlist
+
from twisted.trial import unittest
from twisted.python.usage import Options, UsageError
@@ -33,7 +38,6 @@
from twistedcaldav.config import config
from twistedcaldav import config as config_mod
-from twistedcaldav.py.plistlib import writePlist
from twistedcaldav.directory.aggregate import AggregateDirectoryService
from twistedcaldav.directory.sudo import SudoDirectoryService
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081029/1da40ad8/attachment-0001.html>
More information about the calendarserver-changes
mailing list