Merge lp:~barry/ubuntu/natty/winpdb/bug-761131 into lp:ubuntu/natty/winpdb
- Natty (11.04)
- bug-761131
- Merge into natty
Proposed by
Barry Warsaw
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Colin Watson | ||||
Proposed branch: | lp:~barry/ubuntu/natty/winpdb/bug-761131 | ||||
Merge into: | lp:ubuntu/natty/winpdb | ||||
Diff against target: |
479 lines (+161/-179) 9 files modified
.hg_archival.txt (+2/-0) .hgtags (+2/-0) PKG-INFO (+0/-13) README.txt (+1/-1) debian/changelog (+7/-0) debian/watch (+1/-2) rpdb2.py (+141/-156) setup.py (+1/-1) winpdb.py (+6/-6) |
||||
To merge this branch: | bzr merge lp:~barry/ubuntu/natty/winpdb/bug-761131 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Luke Yelavich (community) | Needs Information | ||
Ubuntu branches | Pending | ||
Review via email: mp+57787@code.launchpad.net |
Commit message
Description of the change
bzr merge-upstream with new debian/watch file.
To post a comment you must log in.
- 13. By Barry Warsaw
-
Debian still has 1.4.6-2
Revision history for this message
Barry Warsaw (barry) wrote : | # |
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.
Revision history for this message
Jamie Strandboge (jdstrand) wrote : | # |
This is now marked Fix Released in the bug since Oneiric and Debian have 1.4.8-1.
Revision history for this message
Colin Watson (cjwatson) wrote : | # |
Rejected per the comments above and dholbach's request.
Revision history for this message
Barry Warsaw (barry) wrote : | # |
WFM! Thanks.
Unmerged revisions
- 13. By Barry Warsaw
-
Debian still has 1.4.6-2
- 12. By Barry Warsaw
-
* debian/watch: Downloads are now on code.google.com.
* New upstream release. (LP: #761131) - 11. By Barry Warsaw
-
Downloads are now on code.google.com.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file '.hg_archival.txt' | |||
2 | --- .hg_archival.txt 1970-01-01 00:00:00 +0000 | |||
3 | +++ .hg_archival.txt 2011-04-21 21:18:39 +0000 | |||
4 | @@ -0,0 +1,2 @@ | |||
5 | 1 | repo: f88e6e3493b83efb388dae63f265b7c8495d2453 | ||
6 | 2 | node: 0aed109de5d171c00dbab20a1e4631d321ba5233 | ||
7 | 0 | 3 | ||
8 | === added file '.hgtags' | |||
9 | --- .hgtags 1970-01-01 00:00:00 +0000 | |||
10 | +++ .hgtags 2011-04-21 21:18:39 +0000 | |||
11 | @@ -0,0 +1,2 @@ | |||
12 | 1 | 22ebb952cad2e4c6f2612484711dfcf044a670d7 winpdb-1.4.6 | ||
13 | 2 | 4803baa67c54c607093ef3e0f7119486203a11ba winpdb-1.4.6 retag! | ||
14 | 0 | 3 | ||
15 | === removed file 'PKG-INFO' | |||
16 | --- PKG-INFO 2009-04-19 14:46:16 +0000 | |||
17 | +++ PKG-INFO 1970-01-01 00:00:00 +0000 | |||
18 | @@ -1,13 +0,0 @@ | |||
19 | 1 | Metadata-Version: 1.0 | ||
20 | 2 | Name: winpdb | ||
21 | 3 | Version: 1.4.6 | ||
22 | 4 | Summary: A platform independent GPL Python debugger. | ||
23 | 5 | Home-page: http://www.winpdb.org/ | ||
24 | 6 | Author: Nir Aides | ||
25 | 7 | Author-email: nir@winpdb.org | ||
26 | 8 | License: GNU GPL | ||
27 | 9 | Description: Winpdb is a platform independent GPL Python debugger | ||
28 | 10 | with support for multiple threads, namespace modification, | ||
29 | 11 | embedded debugging, encrypted communication | ||
30 | 12 | and is up to 20 times faster than pdb. | ||
31 | 13 | Platform: any | ||
32 | 14 | 0 | ||
33 | === modified file 'README.txt' | |||
34 | --- README.txt 2009-04-19 14:46:16 +0000 | |||
35 | +++ README.txt 2011-04-21 21:18:39 +0000 | |||
36 | @@ -6,7 +6,7 @@ | |||
37 | 6 | Contact: Nir Aides | 6 | Contact: Nir Aides |
38 | 7 | Email: nir@winpdb.org | 7 | Email: nir@winpdb.org |
39 | 8 | Website: http://www.winpdb.org/ | 8 | Website: http://www.winpdb.org/ |
41 | 9 | Version: 1.4.6 | 9 | Version: 1.4.8 |
42 | 10 | 10 | ||
43 | 11 | 11 | ||
44 | 12 | 12 | ||
45 | 13 | 13 | ||
46 | === modified file 'debian/changelog' | |||
47 | --- debian/changelog 2009-10-01 22:27:05 +0000 | |||
48 | +++ debian/changelog 2011-04-21 21:18:39 +0000 | |||
49 | @@ -1,3 +1,10 @@ | |||
50 | 1 | winpdb (1.4.8-0ubuntu1) natty; urgency=low | ||
51 | 2 | |||
52 | 3 | * debian/watch: Downloads are now on code.google.com. | ||
53 | 4 | * New upstream release. (LP: #761131) | ||
54 | 5 | |||
55 | 6 | -- Barry Warsaw <barry@ubuntu.com> Thu, 14 Apr 2011 17:29:44 -0400 | ||
56 | 7 | |||
57 | 1 | winpdb (1.4.6-2) unstable; urgency=low | 8 | winpdb (1.4.6-2) unstable; urgency=low |
58 | 2 | 9 | ||
59 | 3 | [ Severin Heiniger] | 10 | [ Severin Heiniger] |
60 | 4 | 11 | ||
61 | === modified file 'debian/watch' | |||
62 | --- debian/watch 2007-10-08 20:39:23 +0000 | |||
63 | +++ debian/watch 2011-04-21 21:18:39 +0000 | |||
64 | @@ -1,5 +1,4 @@ | |||
65 | 1 | # Compulsory line, this is a version 3 file | 1 | # Compulsory line, this is a version 3 file |
66 | 2 | version=3 | 2 | version=3 |
67 | 3 | 3 | ||
70 | 4 | http://sf.net/winpdb/winpdb-(.*)\.tar\.gz | 4 | 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 |
69 | 5 | |||
71 | 6 | 5 | ||
72 | === modified file 'rpdb2.py' | |||
73 | --- rpdb2.py 2009-04-19 14:46:16 +0000 | |||
74 | +++ rpdb2.py 2011-04-21 21:18:39 +0000 | |||
75 | @@ -1,7 +1,7 @@ | |||
76 | 1 | #! /usr/bin/env python | 1 | #! /usr/bin/env python |
77 | 2 | 2 | ||
78 | 3 | """ | 3 | """ |
80 | 4 | rpdb2.py - version 2.4.6 | 4 | rpdb2.py - version 2.4.8 |
81 | 5 | 5 | ||
82 | 6 | A remote Python debugger for CPython | 6 | A remote Python debugger for CPython |
83 | 7 | 7 | ||
84 | @@ -24,7 +24,7 @@ | |||
85 | 24 | 24 | ||
86 | 25 | COPYRIGHT_NOTICE = """Copyright (C) 2005-2009 Nir Aides""" | 25 | COPYRIGHT_NOTICE = """Copyright (C) 2005-2009 Nir Aides""" |
87 | 26 | 26 | ||
89 | 27 | CREDITS_NOTICE = """This project is waiting for your contribution and support.""" | 27 | CREDITS_NOTICE = """Work on version 2.4.8 was sponsored by Investortools, Inc.""" |
90 | 28 | 28 | ||
91 | 29 | LICENSE_NOTICE = """ | 29 | LICENSE_NOTICE = """ |
92 | 30 | This program is free software; you can redistribute it and/or modify it | 30 | This program is free software; you can redistribute it and/or modify it |
93 | @@ -539,9 +539,9 @@ | |||
94 | 539 | 539 | ||
95 | 540 | 540 | ||
96 | 541 | 541 | ||
100 | 542 | VERSION = (2, 4, 6, 0, 'Tychod') | 542 | VERSION = (2, 4, 8, 0, 'Tychod') |
101 | 543 | RPDB_TITLE = "RPDB 2.4.6 - Tychod" | 543 | RPDB_TITLE = "RPDB 2.4.8 - Tychod" |
102 | 544 | RPDB_VERSION = "RPDB_2_4_6" | 544 | RPDB_VERSION = "RPDB_2_4_8" |
103 | 545 | RPDB_COMPATIBILITY_VERSION = "RPDB_2_4_0" | 545 | RPDB_COMPATIBILITY_VERSION = "RPDB_2_4_0" |
104 | 546 | 546 | ||
105 | 547 | 547 | ||
106 | @@ -2191,8 +2191,12 @@ | |||
107 | 2191 | 2191 | ||
108 | 2192 | 2192 | ||
109 | 2193 | 2193 | ||
112 | 2194 | g_safe_base64_to = string.maketrans(as_bytes('/+='), as_bytes('_-#')) | 2194 | if is_py3k(): |
113 | 2195 | g_safe_base64_from = string.maketrans(as_bytes('_-#'), as_bytes('/+=')) | 2195 | g_safe_base64_to = bytes.maketrans(as_bytes('/+='), as_bytes('_-#')) |
114 | 2196 | g_safe_base64_from = bytes.maketrans(as_bytes('_-#'), as_bytes('/+=')) | ||
115 | 2197 | else: | ||
116 | 2198 | g_safe_base64_to = string.maketrans(as_bytes('/+='), as_bytes('_-#')) | ||
117 | 2199 | g_safe_base64_from = string.maketrans(as_bytes('_-#'), as_bytes('/+=')) | ||
118 | 2196 | 2200 | ||
119 | 2197 | 2201 | ||
120 | 2198 | 2202 | ||
121 | @@ -3962,7 +3966,7 @@ | |||
122 | 3962 | 3966 | ||
123 | 3963 | fd = os.open(path, os.O_WRONLY | os.O_CREAT, int('0600', 8)) | 3967 | fd = os.open(path, os.O_WRONLY | os.O_CREAT, int('0600', 8)) |
124 | 3964 | 3968 | ||
126 | 3965 | os.write(fd, _rpdb2_pwd) | 3969 | os.write(fd, as_bytes(_rpdb2_pwd)) |
127 | 3966 | os.close(fd) | 3970 | os.close(fd) |
128 | 3967 | 3971 | ||
129 | 3968 | 3972 | ||
130 | @@ -9967,156 +9971,93 @@ | |||
131 | 9967 | 9971 | ||
132 | 9968 | 9972 | ||
133 | 9969 | 9973 | ||
205 | 9970 | if not is_py3k(): | 9974 | # |
206 | 9971 | # | 9975 | # MOD |
207 | 9972 | # MOD | 9976 | # |
208 | 9973 | # | 9977 | class CTimeoutHTTPConnection(httplib.HTTPConnection): |
209 | 9974 | class CTimeoutHTTPConnection(httplib.HTTPConnection): | 9978 | """ |
210 | 9975 | """ | 9979 | Modification of httplib.HTTPConnection with timeout for sockets. |
211 | 9976 | Modification of httplib.HTTPConnection with timeout for sockets. | 9980 | """ |
212 | 9977 | """ | 9981 | |
213 | 9978 | 9982 | _rpdb2_timeout = PING_TIMEOUT | |
143 | 9979 | _rpdb2_timeout = PING_TIMEOUT | ||
144 | 9980 | |||
145 | 9981 | def connect(self): | ||
146 | 9982 | """Connect to the host and port specified in __init__.""" | ||
147 | 9983 | msg = "getaddrinfo returns an empty list" | ||
148 | 9984 | for res in socket.getaddrinfo(self.host, self.port, 0, | ||
149 | 9985 | socket.SOCK_STREAM): | ||
150 | 9986 | af, socktype, proto, canonname, sa = res | ||
151 | 9987 | try: | ||
152 | 9988 | self.sock = socket.socket(af, socktype, proto) | ||
153 | 9989 | self.sock.settimeout(self._rpdb2_timeout) | ||
154 | 9990 | if self.debuglevel > 0: | ||
155 | 9991 | print_debug("connect: (%s, %s)" % (self.host, self.port)) | ||
156 | 9992 | self.sock.connect(sa) | ||
157 | 9993 | except socket.error: | ||
158 | 9994 | msg = sys.exc_info()[1] | ||
159 | 9995 | if self.debuglevel > 0: | ||
160 | 9996 | print_debug('connect fail: ' + repr((self.host, self.port))) | ||
161 | 9997 | if self.sock: | ||
162 | 9998 | self.sock.close() | ||
163 | 9999 | self.sock = None | ||
164 | 10000 | continue | ||
165 | 10001 | break | ||
166 | 10002 | if not self.sock: | ||
167 | 10003 | raise socket.error(msg) | ||
168 | 10004 | |||
169 | 10005 | |||
170 | 10006 | |||
171 | 10007 | # | ||
172 | 10008 | # MOD | ||
173 | 10009 | # | ||
174 | 10010 | class CLocalTimeoutHTTPConnection(CTimeoutHTTPConnection): | ||
175 | 10011 | """ | ||
176 | 10012 | Modification of httplib.HTTPConnection with timeout for sockets. | ||
177 | 10013 | """ | ||
178 | 10014 | |||
179 | 10015 | _rpdb2_timeout = LOCAL_TIMEOUT | ||
180 | 10016 | |||
181 | 10017 | |||
182 | 10018 | |||
183 | 10019 | # | ||
184 | 10020 | # MOD | ||
185 | 10021 | # | ||
186 | 10022 | class CTimeoutHTTP(httplib.HTTP): | ||
187 | 10023 | """ | ||
188 | 10024 | Modification of httplib.HTTP with timeout for sockets. | ||
189 | 10025 | """ | ||
190 | 10026 | |||
191 | 10027 | _connection_class = CTimeoutHTTPConnection | ||
192 | 10028 | |||
193 | 10029 | |||
194 | 10030 | |||
195 | 10031 | # | ||
196 | 10032 | # MOD | ||
197 | 10033 | # | ||
198 | 10034 | class CLocalTimeoutHTTP(httplib.HTTP): | ||
199 | 10035 | """ | ||
200 | 10036 | Modification of httplib.HTTP with timeout for sockets. | ||
201 | 10037 | """ | ||
202 | 10038 | |||
203 | 10039 | _connection_class = CLocalTimeoutHTTPConnection | ||
204 | 10040 | |||
214 | 10041 | 9983 | ||
244 | 10042 | 9984 | def connect(self): | |
245 | 10043 | # | 9985 | """Connect to the host and port specified in __init__.""" |
246 | 10044 | # MOD | 9986 | |
247 | 10045 | # | 9987 | # New Python version of connect(). |
248 | 10046 | class CTimeoutTransport(xmlrpclib.Transport): | 9988 | if hasattr(self, 'timeout'): |
249 | 10047 | """ | 9989 | self.timeout = self._rpdb2_timeout |
250 | 10048 | Modification of xmlrpclib.Transport with timeout for sockets. | 9990 | return httplib.HTTPConnection.connect(self) |
251 | 10049 | """ | 9991 | |
252 | 10050 | 9992 | # Old Python version of connect(). | |
253 | 10051 | def make_connection(self, host): | 9993 | msg = "getaddrinfo returns an empty list" |
254 | 10052 | # create a HTTP connection object from a host descriptor | 9994 | for res in socket.getaddrinfo(self.host, self.port, 0, |
255 | 10053 | host, extra_headers, x509 = self.get_host_info(host) | 9995 | socket.SOCK_STREAM): |
256 | 10054 | return CTimeoutHTTP(host) | 9996 | af, socktype, proto, canonname, sa = res |
257 | 10055 | 9997 | try: | |
258 | 10056 | 9998 | self.sock = socket.socket(af, socktype, proto) | |
259 | 10057 | 9999 | self.sock.settimeout(self._rpdb2_timeout) | |
260 | 10058 | # | 10000 | if self.debuglevel > 0: |
261 | 10059 | # MOD | 10001 | print_debug("connect: (%s, %s)" % (self.host, self.port)) |
262 | 10060 | # | 10002 | self.sock.connect(sa) |
263 | 10061 | class CLocalTimeoutTransport(xmlrpclib.Transport): | 10003 | except socket.error: |
264 | 10062 | """ | 10004 | msg = sys.exc_info()[1] |
265 | 10063 | Modification of xmlrpclib.Transport with timeout for sockets. | 10005 | if self.debuglevel > 0: |
266 | 10064 | """ | 10006 | print_debug('connect fail: ' + repr((self.host, self.port))) |
267 | 10065 | 10007 | if self.sock: | |
268 | 10066 | def make_connection(self, host): | 10008 | self.sock.close() |
269 | 10067 | # create a HTTP connection object from a host descriptor | 10009 | self.sock = None |
270 | 10068 | host, extra_headers, x509 = self.get_host_info(host) | 10010 | continue |
271 | 10069 | return CLocalTimeoutHTTP(host) | 10011 | break |
272 | 10070 | 10012 | if not self.sock: | |
273 | 10013 | raise socket.error(msg) | ||
274 | 10014 | |||
275 | 10015 | |||
276 | 10016 | |||
277 | 10017 | # | ||
278 | 10018 | # MOD | ||
279 | 10019 | # | ||
280 | 10020 | class CLocalTimeoutHTTPConnection(CTimeoutHTTPConnection): | ||
281 | 10021 | """ | ||
282 | 10022 | Modification of httplib.HTTPConnection with timeout for sockets. | ||
283 | 10023 | """ | ||
284 | 10024 | |||
285 | 10025 | _rpdb2_timeout = LOCAL_TIMEOUT | ||
286 | 10026 | |||
287 | 10027 | |||
288 | 10028 | |||
289 | 10029 | if is_py3k(): | ||
290 | 10030 | class httplib_HTTP(object): | ||
291 | 10031 | pass | ||
292 | 10071 | else: | 10032 | else: |
341 | 10072 | # | 10033 | httplib_HTTP = httplib.HTTP |
342 | 10073 | # MOD | 10034 | |
343 | 10074 | # | 10035 | |
344 | 10075 | class CTimeoutTransport(xmlrpclib.Transport): | 10036 | |
345 | 10076 | """ | 10037 | # |
346 | 10077 | Modification of xmlrpclib.Transport with timeout for sockets. | 10038 | # MOD |
347 | 10078 | """ | 10039 | # |
348 | 10079 | 10040 | class CTimeoutHTTP(httplib_HTTP): | |
349 | 10080 | def send_request(self, host, handler, request_body, debug): | 10041 | """ |
350 | 10081 | host, extra_headers, x509 = self.get_host_info(host) | 10042 | Modification of httplib.HTTP with timeout for sockets. |
351 | 10082 | connection = httplib.HTTPConnection(host, timeout = PING_TIMEOUT) | 10043 | """ |
352 | 10083 | if debug: | 10044 | |
353 | 10084 | connection.set_debuglevel(1) | 10045 | _connection_class = CTimeoutHTTPConnection |
354 | 10085 | headers = {} | 10046 | |
355 | 10086 | if extra_headers: | 10047 | |
356 | 10087 | for key, val in extra_headers: | 10048 | |
357 | 10088 | header[key] = val | 10049 | # |
358 | 10089 | headers["Content-Type"] = "text/xml" | 10050 | # MOD |
359 | 10090 | headers["User-Agent"] = self.user_agent | 10051 | # |
360 | 10091 | connection.request("POST", handler, request_body, headers) | 10052 | class CLocalTimeoutHTTP(httplib_HTTP): |
361 | 10092 | return connection | 10053 | """ |
362 | 10093 | 10054 | Modification of httplib.HTTP with timeout for sockets. | |
363 | 10094 | 10055 | """ | |
364 | 10095 | 10056 | ||
365 | 10096 | # | 10057 | _connection_class = CLocalTimeoutHTTPConnection |
366 | 10097 | # MOD | 10058 | |
367 | 10098 | # | 10059 | |
368 | 10099 | class CLocalTimeoutTransport(xmlrpclib.Transport): | 10060 | |
321 | 10100 | """ | ||
322 | 10101 | Modification of xmlrpclib.Transport with timeout for sockets. | ||
323 | 10102 | """ | ||
324 | 10103 | |||
325 | 10104 | def send_request(self, host, handler, request_body, debug): | ||
326 | 10105 | host, extra_headers, x509 = self.get_host_info(host) | ||
327 | 10106 | connection = httplib.HTTPConnection(host, timeout = LOCAL_TIMEOUT) | ||
328 | 10107 | if debug: | ||
329 | 10108 | connection.set_debuglevel(1) | ||
330 | 10109 | headers = {} | ||
331 | 10110 | if extra_headers: | ||
332 | 10111 | for key, val in extra_headers: | ||
333 | 10112 | header[key] = val | ||
334 | 10113 | headers["Content-Type"] = "text/xml" | ||
335 | 10114 | headers["User-Agent"] = self.user_agent | ||
336 | 10115 | connection.request("POST", handler, request_body, headers) | ||
337 | 10116 | return connection | ||
338 | 10117 | |||
339 | 10118 | |||
340 | 10119 | |||
369 | 10120 | # | 10061 | # |
370 | 10121 | # MOD | 10062 | # MOD |
371 | 10122 | # | 10063 | # |
372 | @@ -10126,6 +10067,24 @@ | |||
373 | 10126 | bug. | 10067 | bug. |
374 | 10127 | """ | 10068 | """ |
375 | 10128 | 10069 | ||
376 | 10070 | _connection_class = httplib.HTTPConnection | ||
377 | 10071 | _connection_class_old = httplib_HTTP | ||
378 | 10072 | |||
379 | 10073 | |||
380 | 10074 | def make_connection(self, host): | ||
381 | 10075 | # New Python version of connect(). | ||
382 | 10076 | # However, make_connection is hacked to always create a new connection | ||
383 | 10077 | # Otherwise all threads use single connection and crash. | ||
384 | 10078 | if hasattr(self, '_connection'): | ||
385 | 10079 | chost, self._extra_headers, x509 = self.get_host_info(host) | ||
386 | 10080 | return self._connection_class(chost) | ||
387 | 10081 | |||
388 | 10082 | # Old Python version of connect(). | ||
389 | 10083 | # create a HTTP connection object from a host descriptor | ||
390 | 10084 | host, extra_headers, x509 = self.get_host_info(host) | ||
391 | 10085 | return self._connection_class_old(host) | ||
392 | 10086 | |||
393 | 10087 | |||
394 | 10129 | def __parse_response(self, file, sock): | 10088 | def __parse_response(self, file, sock): |
395 | 10130 | # read response from input file/socket, and parse it | 10089 | # read response from input file/socket, and parse it |
396 | 10131 | 10090 | ||
397 | @@ -10153,6 +10112,32 @@ | |||
398 | 10153 | 10112 | ||
399 | 10154 | 10113 | ||
400 | 10155 | 10114 | ||
401 | 10115 | # | ||
402 | 10116 | # MOD | ||
403 | 10117 | # | ||
404 | 10118 | class CTimeoutTransport(CLocalTransport): | ||
405 | 10119 | """ | ||
406 | 10120 | Modification of xmlrpclib.Transport with timeout for sockets. | ||
407 | 10121 | """ | ||
408 | 10122 | |||
409 | 10123 | _connection_class = CTimeoutHTTPConnection | ||
410 | 10124 | _connection_class_old = CTimeoutHTTP | ||
411 | 10125 | |||
412 | 10126 | |||
413 | 10127 | |||
414 | 10128 | # | ||
415 | 10129 | # MOD | ||
416 | 10130 | # | ||
417 | 10131 | class CLocalTimeoutTransport(CLocalTransport): | ||
418 | 10132 | """ | ||
419 | 10133 | Modification of xmlrpclib.Transport with timeout for sockets. | ||
420 | 10134 | """ | ||
421 | 10135 | |||
422 | 10136 | _connection_class = CLocalTimeoutHTTPConnection | ||
423 | 10137 | _connection_class_old = CLocalTimeoutHTTP | ||
424 | 10138 | |||
425 | 10139 | |||
426 | 10140 | |||
427 | 10156 | class CSession: | 10141 | class CSession: |
428 | 10157 | """ | 10142 | """ |
429 | 10158 | Basic class that communicates with the debuggee server. | 10143 | Basic class that communicates with the debuggee server. |
430 | 10159 | 10144 | ||
431 | === modified file 'setup.py' | |||
432 | --- setup.py 2009-04-19 14:46:16 +0000 | |||
433 | +++ setup.py 2011-04-21 21:18:39 +0000 | |||
434 | @@ -51,7 +51,7 @@ | |||
435 | 51 | 51 | ||
436 | 52 | setup( | 52 | setup( |
437 | 53 | name = 'winpdb', | 53 | name = 'winpdb', |
439 | 54 | version = '1.4.6', | 54 | version = '1.4.8', |
440 | 55 | description = 'A platform independent GPL Python debugger.', | 55 | description = 'A platform independent GPL Python debugger.', |
441 | 56 | long_description = LONG_DESC, | 56 | long_description = LONG_DESC, |
442 | 57 | author = 'Nir Aides', | 57 | author = 'Nir Aides', |
443 | 58 | 58 | ||
444 | === modified file 'winpdb.py' | |||
445 | --- winpdb.py 2009-04-19 14:46:16 +0000 | |||
446 | +++ winpdb.py 2011-04-21 21:18:39 +0000 | |||
447 | @@ -40,7 +40,7 @@ | |||
448 | 40 | See the GNU General Public License for more details. | 40 | See the GNU General Public License for more details. |
449 | 41 | 41 | ||
450 | 42 | Credits: | 42 | Credits: |
452 | 43 | This project is waiting for your contribution and support.""" | 43 | Work on version 1.4.8 was sponsored by Investortools, Inc.""" |
453 | 44 | 44 | ||
454 | 45 | LICENSE_NOTICE = """ | 45 | LICENSE_NOTICE = """ |
455 | 46 | This program is free software; you can redistribute it and/or modify it | 46 | This program is free software; you can redistribute it and/or modify it |
456 | @@ -495,9 +495,9 @@ | |||
457 | 495 | TLC_HEADER_REPR = "Repr" | 495 | TLC_HEADER_REPR = "Repr" |
458 | 496 | TLC_HEADER_TYPE = "Type" | 496 | TLC_HEADER_TYPE = "Type" |
459 | 497 | 497 | ||
463 | 498 | VERSION = (1, 4, 6, 0, 'Tychod') | 498 | VERSION = (1, 4, 8, 0, 'Tychod') |
464 | 499 | WINPDB_TITLE = "Winpdb 1.4.6 - Tychod" | 499 | WINPDB_TITLE = "Winpdb 1.4.8 - Tychod" |
465 | 500 | WINPDB_VERSION = "WINPDB_1_4_6" | 500 | WINPDB_VERSION = "WINPDB_1_4_8" |
466 | 501 | 501 | ||
467 | 502 | WINPDB_SIZE = "winpdb_size" | 502 | WINPDB_SIZE = "winpdb_size" |
468 | 503 | WINPDB_MAXIMIZE = "winpdb_maximize" | 503 | WINPDB_MAXIMIZE = "winpdb_maximize" |
469 | @@ -4650,8 +4650,8 @@ | |||
470 | 4650 | 4650 | ||
471 | 4651 | 4651 | ||
472 | 4652 | def main(): | 4652 | def main(): |
475 | 4653 | if rpdb2.get_version() != "RPDB_2_4_6": | 4653 | if rpdb2.get_version() != "RPDB_2_4_8": |
476 | 4654 | rpdb2._print(STR_ERROR_INTERFACE_COMPATIBILITY % ("RPDB_2_4_6", rpdb2.get_version())) | 4654 | rpdb2._print(STR_ERROR_INTERFACE_COMPATIBILITY % ("RPDB_2_4_8", rpdb2.get_version())) |
477 | 4655 | return | 4655 | return |
478 | 4656 | 4656 | ||
479 | 4657 | return rpdb2.main(StartClient, WINPDB_TITLE) | 4657 | return rpdb2.main(StartClient, WINPDB_TITLE) |
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.