[CalendarServer-changes] [12063] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 12063
          http://trac.calendarserver.org//changeset/12063
Author:   wsanchez at apple.com
Date:     2013-12-12 16:50:00 -0800 (Thu, 12 Dec 2013)
Log Message:
-----------
Get rid of twext.patches, twext.backport.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/__init__.py

Removed Paths:
-------------
    CalendarServer/trunk/twext/backport/
    CalendarServer/trunk/twext/patches.py

Modified: CalendarServer/trunk/calendarserver/__init__.py
===================================================================
--- 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)
@@ -19,13 +19,10 @@
 CalendarServer application code.
 """
 
-# Make sure we have twext's required Twisted patches loaded before we do
-# anything at all.
-__import__("twext")
-
 #
 # setuptools is annoying
 #
+
 from warnings import filterwarnings
 filterwarnings("ignore", "Module (.*) was already imported (.*)")
 del filterwarnings
@@ -38,3 +35,11 @@
     from calendarserver.version import version as __version__
 except ImportError:
     __version__ = None
+
+
+#
+# Get imap4 module to STFU
+#
+
+# from twisted.mail.imap4 import Command
+# Command._1_RESPONSES += tuple(['BYE'])

Deleted: CalendarServer/trunk/twext/patches.py
===================================================================
--- 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)
@@ -1,87 +0,0 @@
-##
-# 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'])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/fa866679/attachment.html>