Merge missing-dist3-module-8220-2: Add a missing module to twisted.py…

…thon.dist3 Fixes: twisted#8220 Author: doko Reviewer: hawkowl git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@46866 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
TaurusTiger · Feb 28, 2016 · 2f1c34f · 2f1c34f
1 parent 9bc27f6
commit 2f1c34f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 0 deletions.
diff --git a/twisted/conch/ssh/_cryptography_backports.py b/twisted/conch/ssh/_cryptography_backports.py
@@ -7,6 +7,7 @@
 These functions can be obtained from C{cryptography.utils} instead, from
 version 1.1 onwards.
 """
+from __future__ import absolute_import, division
 import binascii
 import struct
 

diff --git a/twisted/python/dist3.py b/twisted/python/dist3.py
@@ -48,6 +48,7 @@
     "twisted.application.test",
     "twisted.conch",
     "twisted.conch.ssh",
+    "twisted.conch.ssh._cryptography_backports",
     "twisted.conch.ssh.common",
     "twisted.conch.ssh.keys",
     "twisted.conch.ssh.sexpy",

diff --git a/twisted/topfiles/8220.misc b/twisted/topfiles/8220.misc