[gentoo-commits] repo/gentoo:master commit in: dev-python/twisted-core/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/twisted-core/files/

[David Seifert]

commit:     0992e0fa69196551ed3afb7730839c91e1eddc41
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Sep 20 16:51:29 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 21:07:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0992e0fa

dev-python/twisted-core: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/2375

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...isted-core-12.0.0-fix-test-timeFormatting.patch | 26 ----------------------
 .../files/twisted-core-2.1.0-zsh-head.patch        | 13 -----------
 2 files changed, 39 deletions(-)

diff --git a/dev-python/twisted-core/files/twisted-core-12.0.0-fix-test-timeFormatting.patch b/dev-python/twisted-core/files/twisted-core-12.0.0-fix-test-timeFormatting.patch
deleted file mode 100644
index a466a97..00000000
--- a/dev-python/twisted-core/files/twisted-core-12.0.0-fix-test-timeFormatting.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Apply patch: use calendar.timegm instead of manual broken timezone math.
-
-Author: marienz
-Review: itamar
-Fixes: #5583
-
-Index: /trunk/twisted/test/test_log.py
-===================================================================
---- /trunk/twisted/test/test_log.py	(revision 32453)
-+++ /trunk/twisted/test/test_log.py	(revision 34145)
-@@ -6,5 +6,5 @@
- """
- 
--import os, sys, time, logging, warnings
-+import os, sys, time, logging, warnings, calendar
- from cStringIO import StringIO
- 
-@@ -392,7 +392,5 @@
-         human-readable string.
-         """
--        # There is no function in the time module which converts a UTC time
--        # tuple to a timestamp.
--        when = time.mktime((2001, 2, 3, 4, 5, 6, 7, 8, 0)) - time.timezone
-+        when = calendar.timegm((2001, 2, 3, 4, 5, 6, 7, 8, 0))
- 
-         # Pretend to be in US/Eastern for a moment

diff --git a/dev-python/twisted-core/files/twisted-core-2.1.0-zsh-head.patch b/dev-python/twisted-core/files/twisted-core-2.1.0-zsh-head.patch
deleted file mode 100644
index 236610a..00000000
--- a/dev-python/twisted-core/files/twisted-core-2.1.0-zsh-head.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: twisted/python/_twisted_zsh_stub
-===================================================================
---- twisted/python/_twisted_zsh_stub	(revision 14988)
-+++ twisted/python/_twisted_zsh_stub	(working copy)
-@@ -30,7 +30,7 @@
- 
- function load_twisted_completions() {
-     [[ -z $commands[twistd] ]] && echo 'ERROR: test command "twistd" not found in path' && return 1
--    shebang=$(head -1 $commands[twistd])
-+    shebang=$(head -n1 $commands[twistd])
-     [[ $shebang != \#\!* ]] && echo 'ERROR: invalid shebang line for test script "twistd"' && return 1
-     PYTHON=$shebang[3,-1]
-