[Python-modules-commits] [python-socksipy] 08/10: dropped unicode patch, fixed upstream

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to branch master
in repository python-socksipy.

commit 92e047cd99d9fb21247a2a349fcbfd0cdc0730e5
Author: W. Martin Borgert <debacle at debian.org>
Date:   Mon Dec 28 01:12:19 2015 +0100

    dropped unicode patch, fixed upstream
---
 debian/changelog              |  1 +
 debian/patches/series         |  1 -
 debian/patches/unicode_domain | 27 ---------------------------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57a57af..67cc946 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ python-socksipy (1.5.0+dfsg-1) UNRELEASED; urgency=medium
 
   * adoption by DPMT (Closes: #700554)
   * switch to new upstream and upstream version (Closes: #808872)
+  * dropped unicode patch, fixed upstream
 
  -- W. Martin Borgert <debacle at debian.org>  Sun, 27 Dec 2015 23:27:03 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c9a663a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-unicode_domain
diff --git a/debian/patches/unicode_domain b/debian/patches/unicode_domain
deleted file mode 100644
index 32a3422..0000000
--- a/debian/patches/unicode_domain
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Allows destination address to be unicode
- .
- This allows the package to run using python3.
-Author: Jean-Michel Nirgal Vourgère <jmv_deb at nirgal.com>
-Bug-Debian: https://bugs.debian.org/766752
-Forwarded: no
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2014-10-25
-
-Index: python-socksipy-1.02/socks.py
-===================================================================
---- python-socksipy-1.02.orig/socks.py
-+++ python-socksipy-1.02/socks.py
-@@ -212,7 +212,12 @@ class socksocket(socket.socket):
-             if self.__proxy[3]:
-                 # Resolve remotely
-                 ipaddr = None
--                req = req + chr(0x03).encode() + chr(len(destaddr)).encode() + destaddr
-+                if type(destaddr) != type(b''): # python3
-+                    destaddr_bytes = destaddr.encode()
-+                    # TODO: support "xn--" prefixes as defined by RFC 3490
-+                else:
-+                    destaddr_bytes = destaddr
-+                req = req + chr(0x03).encode() + chr(len(destaddr_bytes)).encode() + destaddr_bytes
-             else:
-                 # Resolve locally
-                 ipaddr = socket.inet_aton(socket.gethostbyname(destaddr))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-socksipy.git