r46868 - Merge missing-dist3-module-8220-2: Add a missing module to twisted.python.dist3
hawkowl-TA+aISz0psMTMxyoc4vAAJOcrHinNvQL0E9HWUfgJXw@public.gmane.org
| Newsgroups | gmane.comp.python.twisted.commits |
|---|---|
| Message-ID | <[email protected]> |
Author: hawkowl
Date: Sat Feb 27 21:05:19 2016
New Revision: 46868
Added:
branches/release-16.0.0-8210/twisted/topfiles/8220.misc
Modified:
branches/release-16.0.0-8210/twisted/conch/ssh/_cryptography_backports.py
branches/release-16.0.0-8210/twisted/python/dist3.py
Log:
Merge missing-dist3-module-8220-2: Add a missing module to twisted.python.dist3
Fixes: #8220
Author: doko
Reviewer: hawkowl
Modified: branches/release-16.0.0-8210/twisted/conch/ssh/_cryptography_backports.py
==============================================================================
--- branches/release-16.0.0-8210/twisted/conch/ssh/_cryptography_backports.py (original)
+++ branches/release-16.0.0-8210/twisted/conch/ssh/_cryptography_backports.py Sat Feb 27 21:05:19 2016
@@ -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
Modified: branches/release-16.0.0-8210/twisted/python/dist3.py
==============================================================================
--- branches/release-16.0.0-8210/twisted/python/dist3.py (original)
+++ branches/release-16.0.0-8210/twisted/python/dist3.py Sat Feb 27 21:05:19 2016
@@ -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",