<!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>[12063] CalendarServer/trunk</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/12063">12063</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 16:50:00 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of twext.patches, twext.backport.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserver__init__py">CalendarServer/trunk/calendarserver/__init__.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>CalendarServer/trunk/twext/backport/</li>
<li><a href="#CalendarServertrunktwextpatchespy">CalendarServer/trunk/twext/patches.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserver__init__py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/__init__.py (12062 => 12063)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/__init__.py 2013-12-13 00:35:58 UTC (rev 12062)
+++ CalendarServer/trunk/calendarserver/__init__.py 2013-12-13 00:50:00 UTC (rev 12063)
</span><span class="lines">@@ -19,13 +19,10 @@
</span><span class="cx"> CalendarServer application code.
</span><span class="cx"> """
</span><span class="cx">
</span><del>-# Make sure we have twext's required Twisted patches loaded before we do
-# anything at all.
-__import__("twext")
-
</del><span class="cx"> #
</span><span class="cx"> # setuptools is annoying
</span><span class="cx"> #
</span><ins>+
</ins><span class="cx"> from warnings import filterwarnings
</span><span class="cx"> filterwarnings("ignore", "Module (.*) was already imported (.*)")
</span><span class="cx"> del filterwarnings
</span><span class="lines">@@ -38,3 +35,11 @@
</span><span class="cx"> from calendarserver.version import version as __version__
</span><span class="cx"> except ImportError:
</span><span class="cx"> __version__ = None
</span><ins>+
+
+#
+# Get imap4 module to STFU
+#
+
+# from twisted.mail.imap4 import Command
+# Command._1_RESPONSES += tuple(['BYE'])
</ins></span></pre></div>
<a id="CalendarServertrunktwextpatchespy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/twext/patches.py (12062 => 12063)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/patches.py 2013-12-13 00:35:58 UTC (rev 12062)
+++ CalendarServer/trunk/twext/patches.py 2013-12-13 00:50:00 UTC (rev 12063)
</span><span class="lines">@@ -1,87 +0,0 @@
</span><del>-##
-# Copyright (c) 2005-2013 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-"""
-Patches for behavior in Twisted which calendarserver requires to be different.
-"""
-
-__all__ = []
-
-import sys
-
-from twisted import version
-from twisted.python.versions import Version
-from twisted.python.modules import getModule
-
-
-
-def _hasIPv6ClientSupport():
- """
- Does the loaded version of Twisted have IPv6 client support?
- """
- lastVersionWithoutIPv6Clients = Version("twisted", 12, 0, 0)
- if version > lastVersionWithoutIPv6Clients:
- return True
- elif version == lastVersionWithoutIPv6Clients:
- # It could be a snapshot of trunk or a branch with this bug fixed.
- # Don't load the module, though, as that would be a bunch of
- # unnecessary work.
- return "_resolveIPv6" in (getModule("twisted.internet.tcp")
- .filePath.getContent())
- else:
- return False
-
-
-
-def _addBackports():
- """
- We currently require 2 backported bugfixes from a future release of
- Twisted, for IPv6 support:
-
- - U{IPv6 client support <http://tm.tl/5085>}
-
- - U{TCP endpoint cancellation <http://tm.tl/4710>}
-
- This function will activate those backports. (Note it must be run before
- any of the modules in question are imported or it will raise an exception.)
-
- This function, L{_hasIPv6ClientSupport}, and all the associated backports
- (i.e., all of C{twext/backport}) should be removed upon upgrading our
- minimum required Twisted version.
- """
- from twext.backport import internet as bpinternet
- from twisted import internet
- internet.__path__[:] = bpinternet.__path__ + internet.__path__
-
- # Make sure none of the backports are loaded yet.
- backports = getModule("twext.backport.internet")
- for submod in backports.iterModules():
- subname = submod.name.split(".")[-1]
- tiname = 'twisted.internet.' + subname
- if tiname in sys.modules:
- raise RuntimeError(
- tiname + "already loaded, cannot load required backport")
-
-
-
-if not _hasIPv6ClientSupport():
- _addBackports()
-
-
-
-from twisted.mail.imap4 import Command
-
-Command._1_RESPONSES += tuple(['BYE'])
</del></span></pre>
</div>
</div>
</body>
</html>