[CalendarServer-changes] [13307] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Apr 17 09:51:44 PDT 2014
Revision: 13307
http://trac.calendarserver.org//changeset/13307
Author: cdaboo at apple.com
Date: 2014-04-17 09:51:44 -0700 (Thu, 17 Apr 2014)
Log Message:
-----------
Mostly whitespace.
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/provision/test/test_root.py
CalendarServer/trunk/calendarserver/tools/changeip_calendar.py
CalendarServer/trunk/calendarserver/tools/principals.py
CalendarServer/trunk/calendarserver/tools/shell/test/test_vfs.py
CalendarServer/trunk/calendarserver/tools/test/test_principals.py
CalendarServer/trunk/calendarserver/tools/test/test_purge.py
CalendarServer/trunk/calendarserver/tools/util.py
CalendarServer/trunk/calendarserver/webadmin/eventsource.py
CalendarServer/trunk/calendarserver/webadmin/logs.py
CalendarServer/trunk/calendarserver/webadmin/principals.py
CalendarServer/trunk/calendarserver/webadmin/resource.py
CalendarServer/trunk/twistedcaldav/directory/addressbook.py
CalendarServer/trunk/twistedcaldav/directory/principal.py
CalendarServer/trunk/twistedcaldav/directory/util.py
CalendarServer/trunk/twistedcaldav/localization.py
CalendarServer/trunk/twistedcaldav/sharing.py
CalendarServer/trunk/twistedcaldav/storebridge.py
CalendarServer/trunk/twistedcaldav/util.py
CalendarServer/trunk/txdav/carddav/datastore/query/filter.py
CalendarServer/trunk/txdav/common/datastore/sql.py
CalendarServer/trunk/txdav/common/datastore/test/test_sql.py
CalendarServer/trunk/txdav/dps/client.py
CalendarServer/trunk/txdav/dps/commands.py
CalendarServer/trunk/txdav/dps/json.py
CalendarServer/trunk/txdav/who/test/test_delegates.py
CalendarServer/trunk/txdav/who/test/test_directory.py
CalendarServer/trunk/txdav/who/test/test_groups.py
CalendarServer/trunk/txdav/who/test/test_util.py
CalendarServer/trunk/txdav/who/util.py
CalendarServer/trunk/txdav/who/wiki.py
Modified: CalendarServer/trunk/calendarserver/provision/test/test_root.py
===================================================================
--- CalendarServer/trunk/calendarserver/provision/test/test_root.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/provision/test/test_root.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -183,7 +183,7 @@
)
try:
- resrc, _ignore_segments = (yield maybeDeferred(
+ _ignore_resrc, _ignore_segments = (yield maybeDeferred(
self.actualRoot.locateChild, request, ["principals"]
))
raise AssertionError(
@@ -210,7 +210,7 @@
)
try:
- resrc, _ignore_segments = (yield maybeDeferred(
+ _ignore_resrc, _ignore_segments = (yield maybeDeferred(
self.actualRoot.locateChild, request, ["principals"]
))
raise AssertionError(
@@ -244,7 +244,7 @@
)
try:
- resrc, _ignore_segments = (yield maybeDeferred(
+ _ignore_resrc, _ignore_segments = (yield maybeDeferred(
self.actualRoot.locateChild, request, ["principals"]
))
raise AssertionError(
@@ -389,7 +389,7 @@
request = SimpleStoreRequest(self, "GET", "/principals/")
- resrc, _ignore_segments = (yield maybeDeferred(
+ _ignore_resrc, _ignore_segments = (yield maybeDeferred(
self.actualRoot.locateChild, request, ["principals"]
))
self.assertTrue(request.checkedWiki)
Modified: CalendarServer/trunk/calendarserver/tools/changeip_calendar.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/changeip_calendar.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/tools/changeip_calendar.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -51,6 +51,7 @@
print(" new-hostname - new FQDN for the server")
+
def log(msg):
serverRoot = serverRootLocation()
logDir = os.path.join(serverRoot, "Logs")
@@ -66,6 +67,7 @@
pass
+
def main():
name = os.path.basename(sys.argv[0])
@@ -144,6 +146,7 @@
return plistlib.readPlistFromString(output)["result"]
+
def readConfig(configFile=None):
"""
Ask calendarserver_config for the current configuration
@@ -167,6 +170,7 @@
return sendCommand(command)
+
def updateConfig(
config,
oldIP, newIP,
Modified: CalendarServer/trunk/calendarserver/tools/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/principals.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/tools/principals.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -101,6 +101,7 @@
sys.exit(0)
+
class PrincipalService(WorkerService):
"""
Executes principals-related functions in a context which has access to the store
@@ -476,7 +477,6 @@
-
@inlineCallbacks
def action_listProxies(store, record, *proxyTypes):
directory = store.directoryService()
@@ -503,6 +503,7 @@
print("No %s proxies for %s" % (proxyType, prettyRecord(record)))
+
@inlineCallbacks
def action_listProxyFor(store, record, *proxyTypes):
directory = store.directoryService()
@@ -534,6 +535,7 @@
)
+
@inlineCallbacks
def _addRemoveProxy(msg, fn, store, record, proxyType, *proxyIDs):
directory = store.directoryService()
@@ -554,11 +556,13 @@
)
+
@inlineCallbacks
def action_addProxy(store, record, proxyType, *proxyIDs):
yield _addRemoveProxy("Added", addDelegate, store, record, proxyType, *proxyIDs)
+
@inlineCallbacks
def action_removeProxy(store, record, *proxyIDs):
# Write
@@ -621,8 +625,6 @@
-
-
def action_getAutoScheduleMode(store, record):
print(
"Auto-schedule mode for {record} is {mode}".format(
@@ -635,6 +637,7 @@
)
+
@inlineCallbacks
def action_setAutoScheduleMode(store, record, autoScheduleMode):
if record.recordType == RecordType.group:
@@ -672,6 +675,7 @@
yield record.service.updateRecords([updatedRecord], create=False)
+
@inlineCallbacks
def action_setAutoAcceptGroup(store, record, autoAcceptGroup):
if record.recordType == RecordType.group:
@@ -739,6 +743,7 @@
)
+
@inlineCallbacks
def action_setValue(store, record, name, value):
print(
@@ -756,6 +761,7 @@
yield record.service.updateRecords([updatedRecord], create=False)
+
def action_getValue(store, record, name):
try:
value = record.fields[record.service.fieldName.lookupByName(name)]
@@ -772,6 +778,7 @@
)
+
@inlineCallbacks
def printGroupCacherInfo(service, store):
"""
@@ -782,7 +789,7 @@
txn = store.newTransaction()
groupUIDs = yield txn.allGroupDelegates()
for groupUID in groupUIDs:
- groupID, name, membershipHash, modified = yield txn.groupByUID(
+ groupID, name, _ignore_membershipHash, modified = yield txn.groupByUID(
groupUID
)
print("Group: \"{name}\" ({uid})".format(name=name, uid=groupUID))
@@ -874,7 +881,5 @@
-
-
if __name__ == "__main__":
main()
Modified: CalendarServer/trunk/calendarserver/tools/shell/test/test_vfs.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/shell/test/test_vfs.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/tools/shell/test/test_vfs.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -174,7 +174,6 @@
# )
# self.folder = UIDsFolder(self.svc, ())
-
@inlineCallbacks
def test_list(self):
"""
Modified: CalendarServer/trunk/calendarserver/tools/test/test_principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_principals.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/tools/test/test_principals.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -15,7 +15,6 @@
##
import os
-import sys
from calendarserver.tools.principals import (
parseCreationArgs, matchStrings,
@@ -193,7 +192,6 @@
)
-
def test_matchStrings(self):
self.assertEquals("abc", matchStrings("a", ("abc", "def")))
self.assertEquals("def", matchStrings("de", ("abc", "def")))
Modified: CalendarServer/trunk/calendarserver/tools/test/test_purge.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_purge.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/tools/test/test_purge.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -858,7 +858,6 @@
yield txn.commit()
-
@inlineCallbacks
def populate(self):
yield populateCalendarsFrom(self.requirements, self.storeUnderTest())
Modified: CalendarServer/trunk/calendarserver/tools/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/util.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/tools/util.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -386,6 +386,7 @@
raise ValueError("Invalid principal identifier: %s" % (principalID,))
+
@inlineCallbacks
def recordForPrincipalID(directory, principalID, checkOnly=False):
@@ -549,6 +550,7 @@
prettyRecord(principal.record)
+
def prettyRecord(record):
return "\"{d}\" {uid} ({rt}) {sn}".format(
d=record.displayName,
Modified: CalendarServer/trunk/calendarserver/webadmin/eventsource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/eventsource.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/webadmin/eventsource.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -121,6 +121,7 @@
"""
+
class EventSourceResource(Resource):
"""
Resource that vends HTML5 EventSource events.
@@ -249,7 +250,6 @@
textAsEvent(eventText, eventID, eventClass, eventRetry)
)
-
if eventID is not None:
# We just scanned all the messages, and none are the last one the
# client saw.
Modified: CalendarServer/trunk/calendarserver/webadmin/logs.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/logs.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -155,13 +155,13 @@
@staticmethod
def idForEvent(event):
- observer, eventClass, logEvent = event
+ _ignore_observer, _ignore_eventClass, logEvent = event
return id(logEvent)
@staticmethod
def classForEvent(event):
- observer, eventClass, logEvent = event
+ _ignore_observer, eventClass, _ignore_logEvent = event
return eventClass
Modified: CalendarServer/trunk/calendarserver/webadmin/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -301,6 +301,7 @@
return request._search_terms
+
#
# This should work when we switch to twext.who
#
@@ -317,6 +318,7 @@
except UnicodeDecodeError:
return u"(error rendering value)"
+
def joinWithBR(elements):
noValues = True
@@ -331,7 +333,6 @@
if noValues:
yield u"(no values)"
-
# slots = {}
# for field, values in record.fields.iteritems():
Modified: CalendarServer/trunk/calendarserver/webadmin/resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/resource.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/webadmin/resource.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -88,12 +88,10 @@
# return u""
-
# @staticmethod
# def queryValues(request, arguments):
# return request.args.get(arguments, [])
-
def __init__(self, elementClass):
Resource.__init__(self)
Modified: CalendarServer/trunk/twistedcaldav/directory/addressbook.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/addressbook.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/directory/addressbook.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -100,7 +100,6 @@
# FIXME: Smells like a hack
directory.addressBookHomesCollection = self
-
#
# Create children
#
Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -1444,6 +1444,3 @@
davxml.Protected(),
),
)
-
-
-
Modified: CalendarServer/trunk/twistedcaldav/directory/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/util.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/directory/util.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -154,7 +154,6 @@
-
def formatLink(url):
"""
Convert a URL string into some twisted.web.template DOM objects for
@@ -171,6 +170,7 @@
return formatList(formatLink(link) for link in urls)
+
def formatPrincipals(principals):
"""
Format a list of principals into some twisted.web.template DOM objects.
@@ -222,5 +222,3 @@
yield " ** %s **: %s\n" % (e.__class__.__name__, e)
if not thereAreAny:
yield " '()\n"
-
-
Modified: CalendarServer/trunk/twistedcaldav/localization.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/localization.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/localization.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -484,6 +484,7 @@
outFile.write(result)
+
def _remapLanguageCode(code):
"""
Remap certain language codes to others, per the localization team
@@ -497,6 +498,7 @@
return code
+
def getLanguage(config):
"""
If the language has been specified explicitly in the config, return it. Otherwise
Modified: CalendarServer/trunk/twistedcaldav/sharing.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/sharing.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/sharing.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -500,7 +500,7 @@
@inlineCallbacks
- def inviteSingleUserToShare(self, userid, cn, ace, summary, request): #@UnusedVariable
+ def inviteSingleUserToShare(self, userid, cn, ace, summary, request): #@UnusedVariable
# We currently only handle local users
sharee = yield self.principalForCalendarUserAddress(userid)
Modified: CalendarServer/trunk/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/storebridge.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -3985,9 +3985,9 @@
customxml.InReplyTo.fromString(jsondata["in-reply-to"]),
customxml.InviteSummary.fromString(jsondata["summary"]) if jsondata["summary"] else None,
customxml.CommonName.fromString(commonName) if commonName else None,
+ **typeAttr
# customxml.FirstNameProperty(record.firstName) if record.firstName else None,
# customxml.LastNameProperty(record.lastName) if record.lastName else None,
- **typeAttr
),
)
else:
Modified: CalendarServer/trunk/twistedcaldav/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/util.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/util.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -495,7 +495,6 @@
-
def bestAcceptType(accepts, allowedTypes):
"""
Given a set of Accept headers and the set of types the server can return, determine the best choice
Modified: CalendarServer/trunk/txdav/carddav/datastore/query/filter.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/query/filter.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/carddav/datastore/query/filter.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -253,6 +253,8 @@
else:
return not allof
+
+
class PropertyFilter (FilterChildBase):
"""
Limits a search to specific properties.
Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -1518,7 +1518,6 @@
pass
-
@inlineCallbacks
def addDelegateGroup(self, delegator, delegateGroupID, readWrite,
isExternal=False):
@@ -1550,7 +1549,6 @@
pass
-
def removeDelegate(self, delegator, delegate, readWrite):
"""
Removes a row from the DELEGATES table. The delegate should not be a
Modified: CalendarServer/trunk/txdav/common/datastore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -474,11 +474,12 @@
self.label = label
self.action = None
+
def commit(self):
self.action = "committed"
return succeed(None)
+
def abort(self):
self.action = "aborted"
return succeed(None)
-
Modified: CalendarServer/trunk/txdav/dps/client.py
===================================================================
--- CalendarServer/trunk/txdav/dps/client.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/dps/client.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -190,7 +190,6 @@
# log.warn("Need to change shortName to unicode")
shortName = shortName.decode("utf-8")
-
return self._call(
RecordWithShortNameCommand,
self._processSingleRecord,
@@ -318,7 +317,6 @@
)
-
def members(self):
return self.service._call(
MembersCommand,
@@ -347,10 +345,8 @@
-
# Test client:
-
@inlineCallbacks
def makeEvenBetterRequest():
ds = DirectoryService(None)
Modified: CalendarServer/trunk/txdav/dps/commands.py
===================================================================
--- CalendarServer/trunk/txdav/dps/commands.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/dps/commands.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -67,6 +67,7 @@
]
+
class RecordsMatchingTokensCommand(amp.Command):
arguments = [
('tokens', amp.ListOf(amp.String())),
@@ -77,6 +78,7 @@
]
+
class RecordsMatchingFieldsCommand(amp.Command):
arguments = [
('fields', amp.ListOf(amp.ListOf(amp.String()))),
@@ -88,6 +90,7 @@
]
+
class UpdateRecordsCommand(amp.Command):
arguments = [
('fieldsList', amp.String()),
Modified: CalendarServer/trunk/txdav/dps/json.py
===================================================================
--- CalendarServer/trunk/txdav/dps/json.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/dps/json.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -39,6 +39,7 @@
return to_json_text(json)
+
def expressionAsJSON(expression):
if isinstance(expression, CompoundExpression):
return compoundExpressionAsJSON(expression)
@@ -51,6 +52,7 @@
)
+
def compoundExpressionAsJSON(expression):
return dict(
type=expression.__class__.__name__,
@@ -59,6 +61,7 @@
)
+
def matchExpressionAsJSON(expression):
return dict(
type=expression.__class__.__name__,
@@ -70,11 +73,13 @@
raise NotImplementedError()
+
def expressionFromJSONText(jsonText):
json = from_json_text(jsonText)
return expressionFromJSON(json)
+
def expressionFromJSON(json):
if not isinstance(json, dict):
raise TypeError("JSON expression must be a dict.")
@@ -95,6 +100,7 @@
)
+
def compoundExpressionFromJSON(json):
try:
expressions_json = json["expressions"]
@@ -110,6 +116,7 @@
return CompoundExpression(expressions, operand)
+
def matchExpressionFromJSON(json):
try:
field_json = json["field"]
@@ -136,6 +143,7 @@
)
+
def to_json_text(obj):
"""
Convert an object into JSON text.
Modified: CalendarServer/trunk/txdav/who/test/test_delegates.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_delegates.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/who/test/test_delegates.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -207,8 +207,8 @@
yield self.directory.recordWithShortName(RecordType.user, name)
)
newSet.add(record.uid)
- groupID, name, membershipHash, modified = (yield txn.groupByUID(group1.uid))
- numAdded, numRemoved = (
+ groupID, name, _ignore_membershipHash, _ignore_modified = (yield txn.groupByUID(group1.uid))
+ _ignore_numAdded, _ignore_numRemoved = (
yield self.groupCacher.synchronizeMembers(txn, groupID, newSet)
)
delegates = (yield delegatesOf(txn, delegator, True, expanded=True))
Modified: CalendarServer/trunk/txdav/who/test/test_directory.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_directory.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/who/test/test_directory.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -34,6 +34,7 @@
pass
+
class DirectoryTestCase(StoreTestCase):
@inlineCallbacks
@@ -69,7 +70,6 @@
u"/principals/__uids__/uid/"
)
-
record = TestDirectoryRecord(
self.directory,
{
@@ -84,7 +84,6 @@
u"mailto:test at example.com"
)
-
record = TestDirectoryRecord(
self.directory,
{
Modified: CalendarServer/trunk/txdav/who/test/test_groups.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_groups.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/who/test/test_groups.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -44,8 +44,8 @@
txn = store.newTransaction()
record = yield self.directory.recordWithUID(u"__top_group_1__")
- groupID, name, membershipHash, modified = (yield txn.groupByUID(record.uid))
- groupID, name, membershipHash, modified = (yield txn.groupByUID(record.uid))
+ _ignore_groupID, _ignore_name, _ignore_membershipHash, _ignore_modified = (yield txn.groupByUID(record.uid))
+ _ignore_groupID, _ignore_name, _ignore_membershipHash, _ignore_modified = (yield txn.groupByUID(record.uid))
yield txn.commit()
Modified: CalendarServer/trunk/txdav/who/test/test_util.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_util.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/who/test/test_util.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -158,7 +158,6 @@
set([WikiRecordType.macOSXServerWiki])
)
-
# And make sure it's functional:
record = yield service.recordWithUID("group07")
self.assertEquals(record.fullNames, [u'Group 07'])
Modified: CalendarServer/trunk/txdav/who/util.py
===================================================================
--- CalendarServer/trunk/txdav/who/util.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/who/util.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -61,12 +61,11 @@
# TODO: use proxyForInterface to ensure we're only using the DPS related
# store API. Also define an IDirectoryProxyStore Interface
if store is None:
- pool, txnFactory = getDBPool(config)
+ _ignore_pool, txnFactory = getDBPool(config)
store = storeFromConfig(config, txnFactory, None)
aggregatedServices = []
-
for serviceKey in ("DirectoryService", "ResourceService"):
serviceValue = config.get(serviceKey, None)
Modified: CalendarServer/trunk/txdav/who/wiki.py
===================================================================
--- CalendarServer/trunk/txdav/who/wiki.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/who/wiki.py 2014-04-17 16:51:44 UTC (rev 13307)
@@ -53,8 +53,8 @@
# FIXME: Should this be Flags?
class WikiAccessLevel(Names):
- none = NamedConstant()
- read = NamedConstant()
+ none = NamedConstant()
+ read = NamedConstant()
write = NamedConstant()
@@ -219,6 +219,7 @@
returnValue(WikiAccessLevel.none)
+
@inlineCallbacks
def getWikiACL(resource, request):
"""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140417/72a843bf/attachment-0001.html>
More information about the calendarserver-changes
mailing list