Changeset 248:8761b0474626


Ignore:
Timestamp:
Dec 4, 2018, 11:27:44 AM (2 weeks ago)
Author:
Ralph Meijer <ralphm@…>
Branch:
default
Parents:
224:16fca7e4806f (diff), 247:290573dcb97a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
hg-git-rename-source:
git
Message:

Merge branch 'release-18.0.0'

Files:
2 deleted
29 edited

Legend:

Unmodified
Added
Removed
  • twisted/plugins/server.py

    • Property exe deleted
  • wokkel/client.py

    • Property exe deleted
  • wokkel/compat.py

    • Property exe deleted
  • wokkel/component.py

    • Property exe deleted
  • wokkel/componentservertap.py

    • Property exe deleted
  • wokkel/data_form.py

    • Property exe deleted
  • wokkel/disco.py

    • Property exe deleted
  • wokkel/formats.py

    • Property exe deleted
  • wokkel/generic.py

    • Property exe deleted
    r195 r246  
    1515from twisted.python import reflect
    1616from twisted.python.deprecate import deprecated
    17 from twisted.python.versions import Version
    1817from twisted.words.protocols.jabber import error, jid, xmlstream
    1918from twisted.words.protocols.jabber.xmlstream import toResponse
    2019from twisted.words.xish import domish, utility
    2120from twisted.words.xish.xmlstream import BootstrapMixin
     21
     22from incremental import Version
    2223
    2324from wokkel.iwokkel import IDisco
     
    335336
    336337
    337 @deprecated(Version("Wokkel", 0, 8, 0), "unicode.encode('idna')")
     338@deprecated(Version("wokkel", 18, 0, 0), "unicode.encode('idna')")
    338339def prepareIDNName(name):
    339340    """
  • wokkel/iwokkel.py

    • Property exe deleted
    r193 r240  
    1212from zope.interface import Interface
    1313from twisted.python.deprecate import deprecatedModuleAttribute
    14 from twisted.python.versions import Version
    1514from twisted.words.protocols.jabber.ijabber import IXMPPHandler
    1615from twisted.words.protocols.jabber.ijabber import IXMPPHandlerCollection
    1716
     17from incremental import Version
     18
    1819deprecatedModuleAttribute(
    19         Version("Wokkel", 0, 7, 0),
     20        Version("wokkel", 0, 7, 0),
    2021        "Use twisted.words.protocols.jabber.ijabber.IXMPPHandler instead.",
    2122        __name__,
     
    2324
    2425deprecatedModuleAttribute(
    25         Version("Wokkel", 0, 7, 0),
     26        Version("wokkel", 0, 7, 0),
    2627        "Use twisted.words.protocols.jabber.ijabber.IXMPPHandlerCollection "
    2728                "instead.",
  • wokkel/ping.py

    • Property exe deleted
  • wokkel/pubsub.py

    • Property exe deleted
  • wokkel/server.py

    • Property exe deleted
  • wokkel/shim.py

    • Property exe deleted
  • wokkel/subprotocols.py

    • Property exe deleted
    r194 r240  
    1717from twisted.python.compat import iteritems, itervalues
    1818from twisted.python.deprecate import deprecatedModuleAttribute
    19 from twisted.python.versions import Version
    2019from twisted.words.protocols.jabber import error, ijabber, xmlstream
    2120from twisted.words.protocols.jabber.xmlstream import toResponse
     
    2423from twisted.words.xish.domish import IElement
    2524
     25from incremental import Version
     26
    2627deprecatedModuleAttribute(
    27         Version("Wokkel", 0, 7, 0),
     28        Version("wokkel", 0, 7, 0),
    2829        "Use twisted.words.protocols.jabber.xmlstream.XMPPHandlerCollection "
    2930                "instead.",
  • wokkel/test/__init__.py

    • Property exe deleted
  • wokkel/test/helpers.py

    • Property exe deleted
  • wokkel/test/test_client.py

    • Property exe deleted
  • wokkel/test/test_compat.py

    • Property exe deleted
  • wokkel/test/test_component.py

    • Property exe deleted
    r205 r247  
    3939
    4040
     41    def getDestination(self):
     42        return None
     43
     44
    4145
    4246class TestableComponent(component.Component):
  • wokkel/test/test_data_form.py

    • Property exe deleted
  • wokkel/test/test_disco.py

    • Property exe deleted
  • wokkel/test/test_generic.py

    • Property exe deleted
    r195 r246  
    1414from twisted.python import deprecate
    1515from twisted.python.compat import unicode
    16 from twisted.python.versions import Version
    1716from twisted.trial import unittest
    1817from twisted.trial.util import suppress as SUPPRESS
    1918from twisted.words.xish import domish
    2019from twisted.words.protocols.jabber.jid import JID
     20
     21from incremental import Version
    2122
    2223from wokkel import generic
     
    326327                             deprecate.getDeprecationWarningString(
    327328                                 generic.prepareIDNName,
    328                                  Version("Wokkel", 0, 8, 0),
     329                                 Version("wokkel", 18, 0, 0),
    329330                                 replacement="unicode.encode('idna')")))]
    330331
     
    334335        prepareIDNName is deprecated.
    335336        """
    336         self.callDeprecated((Version("Wokkel", 0, 8, 0),
     337        self.callDeprecated((Version("wokkel", 18, 0, 0),
    337338                             "unicode.encode('idna')"),
    338339                            generic.prepareIDNName, ("example.com"))
  • wokkel/test/test_ping.py

    • Property exe deleted
  • wokkel/test/test_pubsub.py

    • Property exe deleted
  • wokkel/test/test_server.py

    • Property exe deleted
  • wokkel/test/test_shim.py

    • Property exe deleted
  • wokkel/test/test_subprotocols.py

    • Property exe deleted
    r194 r240  
    3535            warningsShown[0]['message'],
    3636            "wokkel.subprotocols." + attributeName + " "
    37             "was deprecated in Wokkel 0.7.0: Use " + newName + " instead.")
     37            "was deprecated in wokkel 0.7.0: Use " + newName + " instead.")
    3838
    3939
  • wokkel/xmppim.py

    • Property exe deleted
Note: See TracChangeset for help on using the changeset viewer.