Merge lp:~barry/ubuntu/natty/winpdb/bug-761131 into lp:ubuntu/natty/winpdb

[Barry Warsaw]

bzr merge-upstream with new debian/watch file.

[lp:~barry/ubuntu/natty/winpdb/bug-761131]

13. By Barry Warsaw on 2011-04-21

Debian still has 1.4.6-2

[Luke Yelavich (themuso)]

Barry, since Natty is now released, do you think this is SRU worthy? I've only glanced briefly at it but am not sure myself.

Thanks.

review: Needs Information

[Barry Warsaw (barry)]

Hi Luke. I've asked for input from the bug OP, and the Debian maintainer of the package. For now I've marked the bug Incomplete. I don't know myself because I don't use it, and it doesn't have many rdepends, so unless/until we hear about a strong need from others, let's not pursue an SRU for this.

[Jamie Strandboge (jdstrand)]

This is now marked Fix Released in the bug since Oneiric and Debian have 1.4.8-1.

[Colin Watson (cjwatson)]

Rejected per the comments above and dholbach's request.

[Barry Warsaw (barry)]

WFM! Thanks.

Unmerged revisions

13. By Barry Warsaw on 2011-04-21

Debian still has 1.4.6-2

12. By Barry Warsaw on 2011-04-14

* debian/watch: Downloads are now on code.google.com.
* New upstream release. (LP: #761131)

11. By Barry Warsaw on 2011-04-14

Downloads are now on code.google.com.

=== added file '.hg_archival.txt'
--- .hg_archival.txt	1970-01-01 00:00:00 +0000
+++ .hg_archival.txt	2011-04-21 21:18:39 +0000
@@ -0,0 +1,2 @@
+repo: f88e6e3493b83efb388dae63f265b7c8495d2453
+node: 0aed109de5d171c00dbab20a1e4631d321ba5233

=== added file '.hgtags'
--- .hgtags	1970-01-01 00:00:00 +0000
+++ .hgtags	2011-04-21 21:18:39 +0000
@@ -0,0 +1,2 @@
+22ebb952cad2e4c6f2612484711dfcf044a670d7 winpdb-1.4.6
+4803baa67c54c607093ef3e0f7119486203a11ba winpdb-1.4.6 retag!

=== removed file 'PKG-INFO'
--- PKG-INFO	2009-04-19 14:46:16 +0000
+++ PKG-INFO	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Metadata-Version: 1.0
-Name: winpdb
-Version: 1.4.6
-Summary: A platform independent GPL Python debugger.
-Home-page: http://www.winpdb.org/
-Author: Nir Aides
-Author-email: [e-mail]
-License: GNU GPL
-Description: Winpdb is a platform independent GPL Python debugger
-        with support for multiple threads, namespace modification,
-        embedded debugging, encrypted communication
-        and is up to 20 times faster than pdb.
-Platform: any

=== modified file 'README.txt'
--- README.txt	2009-04-19 14:46:16 +0000
+++ README.txt	2011-04-21 21:18:39 +0000
@@ -6,7 +6,7 @@
 Contact: Nir Aides
 Email:   [e-mail]
 Website: http://www.winpdb.org/
-Version: 1.4.6
+Version: 1.4.8
 
 
 

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-01 22:27:05 +0000
+++ debian/changelog	2011-04-21 21:18:39 +0000
@@ -1,3 +1,10 @@
+winpdb (1.4.8-0ubuntu1) natty; urgency=low
+
+  * debian/watch: Downloads are now on code.google.com.
+  * New upstream release.  (LP: #761131)
+
+ -- Barry Warsaw <[e-mail]>  Thu, 14 Apr 2011 17:29:44 -0400
+
 winpdb (1.4.6-2) unstable; urgency=low
 
   [ Severin Heiniger]

=== modified file 'debian/watch'
--- debian/watch	2007-10-08 20:39:23 +0000
+++ debian/watch	2011-04-21 21:18:39 +0000
@@ -1,5 +1,4 @@
 # Compulsory line, this is a version 3 file
 version=3
 
-http://sf.net/winpdb/winpdb-(.*)\.tar\.gz
-
+http://code.google.com/p/winpdb/downloads/detail?name=winpdb-1.4.8.tar.gz&can=2&q= http://winpdb.googlecode.com/files/winpdb-(.*).tar.gz

=== modified file 'rpdb2.py'
--- rpdb2.py	2009-04-19 14:46:16 +0000
+++ rpdb2.py	2011-04-21 21:18:39 +0000
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 """
-    rpdb2.py - version 2.4.6
+    rpdb2.py - version 2.4.8
 
     A remote Python debugger for CPython
 
@@ -24,7 +24,7 @@
 
 COPYRIGHT_NOTICE = """Copyright (C) 2005-2009 Nir Aides"""
 
-CREDITS_NOTICE = """This project is waiting for your contribution and support."""
+CREDITS_NOTICE = """Work on version 2.4.8 was sponsored by Investortools, Inc."""
 
 LICENSE_NOTICE = """
 This program is free software; you can redistribute it and/or modify it 
@@ -539,9 +539,9 @@
 
 
 
-VERSION = (2, 4, 6, 0, 'Tychod')
-RPDB_TITLE = "RPDB 2.4.6 - Tychod"
-RPDB_VERSION = "RPDB_2_4_6"
+VERSION = (2, 4, 8, 0, 'Tychod')
+RPDB_TITLE = "RPDB 2.4.8 - Tychod"
+RPDB_VERSION = "RPDB_2_4_8"
 RPDB_COMPATIBILITY_VERSION = "RPDB_2_4_0"
 
 
@@ -2191,8 +2191,12 @@
 
 
 
-g_safe_base64_to = string.maketrans(as_bytes('/+='), as_bytes('_-#'))
-g_safe_base64_from = string.maketrans(as_bytes('_-#'), as_bytes('/+='))
+if is_py3k():
+    g_safe_base64_to = bytes.maketrans(as_bytes('/+='), as_bytes('_-#'))
+    g_safe_base64_from = bytes.maketrans(as_bytes('_-#'), as_bytes('/+='))
+else:
+    g_safe_base64_to = string.maketrans(as_bytes('/+='), as_bytes('_-#'))
+    g_safe_base64_from = string.maketrans(as_bytes('_-#'), as_bytes('/+='))
 
 
 
@@ -3962,7 +3966,7 @@
 
     fd = os.open(path, os.O_WRONLY | os.O_CREAT, int('0600', 8))
     
-    os.write(fd, _rpdb2_pwd)
+    os.write(fd, as_bytes(_rpdb2_pwd))
     os.close(fd)
     
         
@@ -9967,156 +9971,93 @@
 
 
 
-if not is_py3k():
-    #
-    # MOD
-    #
-    class CTimeoutHTTPConnection(httplib.HTTPConnection):
-        """
-        Modification of httplib.HTTPConnection with timeout for sockets.
-        """
-
-        _rpdb2_timeout = PING_TIMEOUT
-        
-        def connect(self):
-            """Connect to the host and port specified in __init__."""
-            msg = "getaddrinfo returns an empty list"
-            for res in socket.getaddrinfo(self.host, self.port, 0,
-                                          socket.SOCK_STREAM):
-                af, socktype, proto, canonname, sa = res
-                try:
-                    self.sock = socket.socket(af, socktype, proto)
-                    self.sock.settimeout(self._rpdb2_timeout)
-                    if self.debuglevel > 0:
-                        print_debug("connect: (%s, %s)" % (self.host, self.port))
-                    self.sock.connect(sa)
-                except socket.error:
-                    msg = sys.exc_info()[1]
-                    if self.debuglevel > 0:
-                        print_debug('connect fail: ' + repr((self.host, self.port)))
-                    if self.sock:
-                        self.sock.close()
-                    self.sock = None
-                    continue
-                break
-            if not self.sock:
-                raise socket.error(msg)
-
-
-
-    #
-    # MOD
-    #
-    class CLocalTimeoutHTTPConnection(CTimeoutHTTPConnection):
-        """
-        Modification of httplib.HTTPConnection with timeout for sockets.
-        """
-
-        _rpdb2_timeout = LOCAL_TIMEOUT
-
-
-
-    #
-    # MOD
-    #
-    class CTimeoutHTTP(httplib.HTTP):
-        """
-        Modification of httplib.HTTP with timeout for sockets.
-        """
-        
-        _connection_class = CTimeoutHTTPConnection
-
-        
-            
-    #
-    # MOD
-    #
-    class CLocalTimeoutHTTP(httplib.HTTP):
-        """
-        Modification of httplib.HTTP with timeout for sockets.
-        """
-        
-        _connection_class = CLocalTimeoutHTTPConnection
-
+#
+# MOD
+#
+class CTimeoutHTTPConnection(httplib.HTTPConnection):
+    """
+    Modification of httplib.HTTPConnection with timeout for sockets.
+    """
+
+    _rpdb2_timeout = PING_TIMEOUT
     
-        
-    #
-    # MOD
-    #
-    class CTimeoutTransport(xmlrpclib.Transport):
-        """
-        Modification of xmlrpclib.Transport with timeout for sockets.
-        """
-        
-        def make_connection(self, host):
-            # create a HTTP connection object from a host descriptor
-            host, extra_headers, x509 = self.get_host_info(host)
-            return CTimeoutHTTP(host)
-
-        
-        
-    #
-    # MOD
-    #
-    class CLocalTimeoutTransport(xmlrpclib.Transport):
-        """
-        Modification of xmlrpclib.Transport with timeout for sockets.
-        """
-        
-        def make_connection(self, host):
-            # create a HTTP connection object from a host descriptor
-            host, extra_headers, x509 = self.get_host_info(host)
-            return CLocalTimeoutHTTP(host)
-
+    def connect(self):
+        """Connect to the host and port specified in __init__."""
+
+        # New Python version of connect().
+        if hasattr(self, 'timeout'):
+            self.timeout = self._rpdb2_timeout
+            return httplib.HTTPConnection.connect(self)
+
+        # Old Python version of connect().
+        msg = "getaddrinfo returns an empty list"
+        for res in socket.getaddrinfo(self.host, self.port, 0,
+                                      socket.SOCK_STREAM):
+            af, socktype, proto, canonname, sa = res
+            try:
+                self.sock = socket.socket(af, socktype, proto)
+                self.sock.settimeout(self._rpdb2_timeout)
+                if self.debuglevel > 0:
+                    print_debug("connect: (%s, %s)" % (self.host, self.port))
+                self.sock.connect(sa)
+            except socket.error:
+                msg = sys.exc_info()[1]
+                if self.debuglevel > 0:
+                    print_debug('connect fail: ' + repr((self.host, self.port)))
+                if self.sock:
+                    self.sock.close()
+                self.sock = None
+                continue
+            break
+        if not self.sock:
+            raise socket.error(msg)
+
+
+
+#
+# MOD
+#
+class CLocalTimeoutHTTPConnection(CTimeoutHTTPConnection):
+    """
+    Modification of httplib.HTTPConnection with timeout for sockets.
+    """
+
+    _rpdb2_timeout = LOCAL_TIMEOUT
+
+
+
+if is_py3k():
+    class httplib_HTTP(object):
+        pass
 else:
-    #
-    # MOD
-    #
-    class CTimeoutTransport(xmlrpclib.Transport):
-        """
-        Modification of xmlrpclib.Transport with timeout for sockets.
-        """
-        
-        def send_request(self, host, handler, request_body, debug):
-            host, extra_headers, x509 = self.get_host_info(host)
-            connection = httplib.HTTPConnection(host, timeout = PING_TIMEOUT)
-            if debug:
-                connection.set_debuglevel(1)
-            headers = {}
-            if extra_headers:
-                for key, val in extra_headers:
-                    header[key] = val
-            headers["Content-Type"] = "text/xml"
-            headers["User-Agent"] = self.user_agent
-            connection.request("POST", handler, request_body, headers)
-            return connection
-
-        
-        
-    #
-    # MOD
-    #
-    class CLocalTimeoutTransport(xmlrpclib.Transport):
-        """
-        Modification of xmlrpclib.Transport with timeout for sockets.
-        """
-        
-        def send_request(self, host, handler, request_body, debug):
-            host, extra_headers, x509 = self.get_host_info(host)
-            connection = httplib.HTTPConnection(host, timeout = LOCAL_TIMEOUT)
-            if debug:
-                connection.set_debuglevel(1)
-            headers = {}
-            if extra_headers:
-                for key, val in extra_headers:
-                    header[key] = val
-            headers["Content-Type"] = "text/xml"
-            headers["User-Agent"] = self.user_agent
-            connection.request("POST", handler, request_body, headers)
-            return connection
-
-
-    
+    httplib_HTTP = httplib.HTTP
+
+
+
+#
+# MOD
+#
+class CTimeoutHTTP(httplib_HTTP):
+    """
+    Modification of httplib.HTTP with timeout for sockets.
+    """
+    
+    _connection_class = CTimeoutHTTPConnection
+
+    
+        
+#
+# MOD
+#
+class CLocalTimeoutHTTP(httplib_HTTP):
+    """
+    Modification of httplib.HTTP with timeout for sockets.
+    """
+    
+    _connection_class = CLocalTimeoutHTTPConnection
+
+    
+
 #
 # MOD
 #
@@ -10126,6 +10067,24 @@
     bug.
     """
     
+    _connection_class = httplib.HTTPConnection
+    _connection_class_old = httplib_HTTP
+
+
+    def make_connection(self, host):
+        # New Python version of connect().
+        # However, make_connection is hacked to always create a new connection
+        # Otherwise all threads use single connection and crash.
+        if hasattr(self, '_connection'):
+            chost, self._extra_headers, x509 = self.get_host_info(host)
+            return self._connection_class(chost)
+ 
+        # Old Python version of connect().
+        # create a HTTP connection object from a host descriptor
+        host, extra_headers, x509 = self.get_host_info(host)
+        return self._connection_class_old(host)
+
+
     def __parse_response(self, file, sock):
         # read response from input file/socket, and parse it
 
@@ -10153,6 +10112,32 @@
 
 
     
+#
+# MOD
+#
+class CTimeoutTransport(CLocalTransport):
+    """
+    Modification of xmlrpclib.Transport with timeout for sockets.
+    """
+   
+    _connection_class = CTimeoutHTTPConnection
+    _connection_class_old = CTimeoutHTTP
+
+    
+    
+#
+# MOD
+#
+class CLocalTimeoutTransport(CLocalTransport):
+    """
+    Modification of xmlrpclib.Transport with timeout for sockets.
+    """
+    
+    _connection_class = CLocalTimeoutHTTPConnection
+    _connection_class_old = CLocalTimeoutHTTP
+   
+
+    
 class CSession:
     """
     Basic class that communicates with the debuggee server.

=== modified file 'setup.py'
--- setup.py	2009-04-19 14:46:16 +0000
+++ setup.py	2011-04-21 21:18:39 +0000
@@ -51,7 +51,7 @@
 
 setup(
     name = 'winpdb',
-    version = '1.4.6',
+    version = '1.4.8',
     description = 'A platform independent GPL Python debugger.',
     long_description = LONG_DESC,
     author = 'Nir Aides',

=== modified file 'winpdb.py'
--- winpdb.py	2009-04-19 14:46:16 +0000
+++ winpdb.py	2011-04-21 21:18:39 +0000
@@ -40,7 +40,7 @@
 See the GNU General Public License for more details.
 
 Credits:
-This project is waiting for your contribution and support."""
+Work on version 1.4.8 was sponsored by Investortools, Inc."""
 
 LICENSE_NOTICE = """
 This program is free software; you can redistribute it and/or modify it 
@@ -495,9 +495,9 @@
 TLC_HEADER_REPR = "Repr"
 TLC_HEADER_TYPE = "Type"
 
-VERSION = (1, 4, 6, 0, 'Tychod')
-WINPDB_TITLE = "Winpdb 1.4.6 - Tychod"
-WINPDB_VERSION = "WINPDB_1_4_6"
+VERSION = (1, 4, 8, 0, 'Tychod')
+WINPDB_TITLE = "Winpdb 1.4.8 - Tychod"
+WINPDB_VERSION = "WINPDB_1_4_8"
 
 WINPDB_SIZE = "winpdb_size"
 WINPDB_MAXIMIZE = "winpdb_maximize"
@@ -4650,8 +4650,8 @@
 
 
 def main():
-    if rpdb2.get_version() != "RPDB_2_4_6":
-        rpdb2._print(STR_ERROR_INTERFACE_COMPATIBILITY % ("RPDB_2_4_6", rpdb2.get_version()))
+    if rpdb2.get_version() != "RPDB_2_4_8":
+        rpdb2._print(STR_ERROR_INTERFACE_COMPATIBILITY % ("RPDB_2_4_8", rpdb2.get_version()))
         return
         
     return rpdb2.main(StartClient, WINPDB_TITLE)