r46845 - make tests work

Author: hawkowl
Date: Wed Feb 24 18:41:08 2016
New Revision: 46845

Removed:
   branches/old-versionpy-8219/twisted/conch/_version.py
   branches/old-versionpy-8219/twisted/mail/_version.py
   branches/old-versionpy-8219/twisted/names/_version.py
   branches/old-versionpy-8219/twisted/news/_version.py
   branches/old-versionpy-8219/twisted/pair/_version.py
   branches/old-versionpy-8219/twisted/runner/_version.py
   branches/old-versionpy-8219/twisted/web/_version.py
   branches/old-versionpy-8219/twisted/words/_version.py
Modified:
   branches/old-versionpy-8219/twisted/conch/__init__.py
   branches/old-versionpy-8219/twisted/mail/__init__.py
   branches/old-versionpy-8219/twisted/names/__init__.py
   branches/old-versionpy-8219/twisted/news/__init__.py
   branches/old-versionpy-8219/twisted/pair/__init__.py
   branches/old-versionpy-8219/twisted/runner/__init__.py
   branches/old-versionpy-8219/twisted/web/__init__.py
   branches/old-versionpy-8219/twisted/words/__init__.py

Log:
make tests work

Modified: branches/old-versionpy-8219/twisted/conch/__init__.py
==============================================================================
--- branches/old-versionpy-8219/twisted/conch/__init__.py	(original)
+++ branches/old-versionpy-8219/twisted/conch/__init__.py	Wed Feb 24 18:41:08 2016
@@ -6,5 +6,13 @@
 Twisted Conch: The Twisted Shell. Terminal emulation, SSHv2 and telnet.
 """
 
-from twisted.conch._version import version
+from twisted.python.versions import Version
+from twisted.python.deprecate import deprecatedModuleAttribute
+
+from twisted._version import version
 __version__ = version.short()
+
+deprecatedModuleAttribute(
+    Version("Twisted", 16, 0, 0),
+    "Use twisted.__version__ instead.",
+    "twisted.conch", "__version__")

Modified: branches/old-versionpy-8219/twisted/mail/__init__.py
==============================================================================
--- branches/old-versionpy-8219/twisted/mail/__init__.py	(original)
+++ branches/old-versionpy-8219/twisted/mail/__init__.py	Wed Feb 24 18:41:08 2016
@@ -5,5 +5,13 @@
 Twisted Mail: Servers and clients for POP3, ESMTP, and IMAP.
 """
 
-from twisted.mail._version import version
+from twisted.python.versions import Version
+from twisted.python.deprecate import deprecatedModuleAttribute
+
+from twisted._version import version
 __version__ = version.short()
+
+deprecatedModuleAttribute(
+    Version("Twisted", 16, 0, 0),
+    "Use twisted.__version__ instead.",
+    "twisted.mail", "__version__")

Modified: branches/old-versionpy-8219/twisted/names/__init__.py
==============================================================================
--- branches/old-versionpy-8219/twisted/names/__init__.py	(original)
+++ branches/old-versionpy-8219/twisted/names/__init__.py	Wed Feb 24 18:41:08 2016
@@ -5,5 +5,13 @@
 Twisted Names: DNS server and client implementations.
 """
 
-from twisted.names._version import version
+from twisted.python.versions import Version
+from twisted.python.deprecate import deprecatedModuleAttribute
+
+from twisted._version import version
 __version__ = version.short()
+
+deprecatedModuleAttribute(
+    Version("Twisted", 16, 0, 0),
+    "Use twisted.__version__ instead.",
+    "twisted.names", "__version__")

Modified: branches/old-versionpy-8219/twisted/news/__init__.py
==============================================================================
--- branches/old-versionpy-8219/twisted/news/__init__.py	(original)
+++ branches/old-versionpy-8219/twisted/news/__init__.py	Wed Feb 24 18:41:08 2016
@@ -5,5 +5,13 @@
 Twisted News: A NNTP-based news service.
 """
 
-from twisted.news._version import version
+from twisted.python.versions import Version
+from twisted.python.deprecate import deprecatedModuleAttribute
+
+from twisted._version import version
 __version__ = version.short()
+
+deprecatedModuleAttribute(
+    Version("Twisted", 16, 0, 0),
+    "Use twisted.__version__ instead.",
+    "twisted.news", "__version__")

Modified: branches/old-versionpy-8219/twisted/pair/__init__.py
==============================================================================
--- branches/old-versionpy-8219/twisted/pair/__init__.py	(original)
+++ branches/old-versionpy-8219/twisted/pair/__init__.py	Wed Feb 24 18:41:08 2016
@@ -1,10 +1,7 @@
-
 # Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
-
 """
-
 Twisted Pair: The framework of your ethernet.
 
 Low-level networking transports and utilities.
@@ -13,8 +10,15 @@
 twisted.protocols.raw and twisted.protocols.rawudp.
 
 Maintainer: Tommi Virtanen
-
 """
 
-from twisted.pair._version import version
+from twisted.python.versions import Version
+from twisted.python.deprecate import deprecatedModuleAttribute
+
+from twisted._version import version
 __version__ = version.short()
+
+deprecatedModuleAttribute(
+    Version("Twisted", 16, 0, 0),
+    "Use twisted.__version__ instead.",
+    "twisted.pair", "__version__")

Modified: branches/old-versionpy-8219/twisted/runner/__init__.py
==============================================================================
--- branches/old-versionpy-8219/twisted/runner/__init__.py	(original)
+++ branches/old-versionpy-8219/twisted/runner/__init__.py	Wed Feb 24 18:41:08 2016
@@ -5,5 +5,13 @@
 Twisted Runner: Run and monitor processes.
 """
 
-from twisted.runner._version import version
+from twisted.python.versions import Version
+from twisted.python.deprecate import deprecatedModuleAttribute
+
+from twisted._version import version
 __version__ = version.short()
+
+deprecatedModuleAttribute(
+    Version("Twisted", 16, 0, 0),
+    "Use twisted.__version__ instead.",
+    "twisted.runner", "__version__")

Modified: branches/old-versionpy-8219/twisted/web/__init__.py
==============================================================================
--- branches/old-versionpy-8219/twisted/web/__init__.py	(original)
+++ branches/old-versionpy-8219/twisted/web/__init__.py	Wed Feb 24 18:41:08 2016
@@ -11,6 +11,13 @@
 a L{web client<twisted.web.client>}.
 """
 
-from twisted.web._version import version
+from twisted.python.versions import Version
+from twisted.python.deprecate import deprecatedModuleAttribute
 
+from twisted._version import version
 __version__ = version.short()
+
+deprecatedModuleAttribute(
+    Version("Twisted", 16, 0, 0),
+    "Use twisted.__version__ instead.",
+    "twisted.web", "__version__")

Modified: branches/old-versionpy-8219/twisted/words/__init__.py
==============================================================================
--- branches/old-versionpy-8219/twisted/words/__init__.py	(original)
+++ branches/old-versionpy-8219/twisted/words/__init__.py	Wed Feb 24 18:41:08 2016
@@ -7,5 +7,13 @@
 services.
 """
 
-from twisted.words._version import version
+from twisted.python.versions import Version
+from twisted.python.deprecate import deprecatedModuleAttribute
+
+from twisted._version import version
 __version__ = version.short()
+
+deprecatedModuleAttribute(
+    Version("Twisted", 16, 0, 0),
+    "Use twisted.__version__ instead.",
+    "twisted.words", "__version__")