<!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>[13076] CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py</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/13076">13076</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 18:19:58 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>lint</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4calendarservertoolsresourcespy">CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4calendarservertoolsresourcespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py (13075 => 13076)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py 2014-04-01 01:12:02 UTC (rev 13075)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py 2014-04-01 01:19:58 UTC (rev 13076)
</span><span class="lines">@@ -15,38 +15,36 @@
</span><span class="cx"> # See the License for the specific language governing permissions and
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><ins>+
</ins><span class="cx"> from __future__ import print_function
</span><span class="cx">
</span><ins>+__all__ = [
+ "migrateResources",
+]
+
+from getopt import getopt, GetoptError
+from grp import getgrnam
</ins><span class="cx"> import os
</span><ins>+from pwd import getpwnam
</ins><span class="cx"> import sys
</span><del>-from grp import getgrnam
-from pwd import getpwnam
-from getopt import getopt, GetoptError
</del><span class="cx">
</span><ins>+from calendarserver.tools.util import (
+ loadConfig, setupMemcached, checkDirectory
+)
+from twext.python.log import Logger, StandardIOObserver
</ins><span class="cx"> from twisted.internet import reactor
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twisted.python.util import switchUID
</span><del>-
-from twext.python.log import Logger, StandardIOObserver
-
</del><span class="cx"> from twistedcaldav.config import config, ConfigurationError
</span><span class="cx"> from twistedcaldav.directory.appleopendirectory import OpenDirectoryService
</span><span class="cx"> from twistedcaldav.directory.directory import DirectoryService, DirectoryError
</span><span class="cx"> from twistedcaldav.directory.xmlfile import XMLDirectoryService
</span><del>-
-from calendarserver.tools.util import loadConfig, setupMemcached, checkDirectory
</del><span class="cx"> from txdav.who.util import directoryFromConfig
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-__all__ = [
- "migrateResources",
-]
-
-
-
</del><span class="cx"> def usage():
</span><span class="cx">
</span><span class="cx"> name = os.path.basename(sys.argv[0])
</span><span class="lines">@@ -156,14 +154,22 @@
</span><span class="cx"> # Find the opendirectory service
</span><span class="cx"> userService = config.directory.serviceForRecordType("users")
</span><span class="cx"> resourceService = config.directory.serviceForRecordType("resources")
</span><del>- if (not isinstance(userService, OpenDirectoryService) or
- not isinstance(resourceService, XMLDirectoryService)):
- abort("This script only migrates resources and locations from OpenDirectory to XML; this calendar server does not have such a configuration.")
</del><ins>+ if (
+ not isinstance(userService, OpenDirectoryService) or
+ not isinstance(resourceService, XMLDirectoryService)
+ ):
+ abort(
+ "This script only migrates resources and locations from "
+ "OpenDirectory to XML; this calendar server does not have such a "
+ "configuration."
+ )
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # Start the reactor
</span><span class="cx"> #
</span><del>- reactor.callLater(0, migrate, userService, resourceService, verbose=verbose)
</del><ins>+ reactor.callLater(
+ 0, migrate, userService, resourceService, verbose=verbose
+ )
</ins><span class="cx"> reactor.run()
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -208,8 +214,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>-def migrateResources(sourceService, destService, autoSchedules=None,
- queryMethod=queryForType, verbose=False):
</del><ins>+def migrateResources(
+ sourceService, destService, autoSchedules=None,
+ queryMethod=queryForType, verbose=False
+):
</ins><span class="cx">
</span><span class="cx"> directoryRecords = []
</span><span class="cx"> augmentRecords = []
</span><span class="lines">@@ -234,23 +242,26 @@
</span><span class="cx"> autoSchedule = autoSchedules.get(guid, 1)
</span><span class="cx"> else:
</span><span class="cx"> autoSchedule = True
</span><del>- augmentRecord = (yield destService.augmentService.getAugmentRecord(guid, recordType))
</del><ins>+ augmentRecord = (
+ yield destService.augmentService.getAugmentRecord(
+ guid, recordType
+ )
+ )
</ins><span class="cx"> augmentRecord.autoSchedule = autoSchedule
</span><span class="cx"> augmentRecords.append(augmentRecord)
</span><span class="cx">
</span><del>- directoryRecords.append(
- (recordType,
- {
- "guid" : guid,
- "shortNames" : [recordName],
- "fullName" : fullName,
- }
- )
- )
</del><ins>+ directoryRecords.append((
+ recordType,
+ {
+ "guid": guid,
+ "shortNames": [recordName],
+ "fullName": fullName,
+ }
+ ))
</ins><span class="cx">
</span><span class="cx"> destService.createRecords(directoryRecords)
</span><span class="cx">
</span><del>- (yield destService.augmentService.addAugmentRecords(augmentRecords))
</del><ins>+ yield destService.augmentService.addAugmentRecords(augmentRecords)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>