[Jython-checkins] SF.net SVN: jython: [4956] branches/Release_2_2maint

[<pj...@us...>]

Revision: 4956
          http://jython.svn.sourceforge.net/jython/?rev=4956&view=rev
Author:   pjenvey
Date:     2008-07-15 19:13:48 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
Merged revisions 4953,4955 via svnmerge from 
https://jython.svn.sourceforge.net/svnroot/jython/trunk

........
  r4953 | pjenvey | 2008-07-15 18:15:46 -0700 (Tue, 15 Jul 2008) | 1 line
  
  restore proto=0 as _realsocket asserts it so
........
  r4955 | pjenvey | 2008-07-15 19:11:48 -0700 (Tue, 15 Jul 2008) | 1 line
  
  use getClass here incase class becomes a permanent keyword in 2.5
........

Modified Paths:
--------------
    branches/Release_2_2maint/jython/Lib/socket.py

Property Changed:
----------------
    branches/Release_2_2maint/


Property changes on: branches/Release_2_2maint
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-3437,3458,3461,3466-3467,3471-3474,3479-3480,3490,3492,3496,3498,3501-3506,3512-3513,3515-3517,3519-3520,3522,3524,3527,3538,3540,3542-3545,3547-3548,3551,3553,3555-3556,3559,3563,3570,3574-3575,3577-3590,3592-3603,3605-3629,3634-3638,3640,3643-3657,3659-3661,3663-3681,3684,3686-3687,3692,3695,3732-3734,3739,3742-3743,3745,3747-3748,3751,3753-3756,3761-3762,3785,3803,3820-3822,3825,3827-3836,3851-3864,3866,3871-3875,3879,3881-3885,3890-3892,3895-3896,3898-3900,3904,3912-3913,4022,4059,4132
   + /trunk:1-3437,3458,3461,3466-3467,3471-3474,3479-3480,3490,3492,3496,3498,3501-3506,3512-3513,3515-3517,3519-3520,3522,3524,3527,3538,3540,3542-3545,3547-3548,3551,3553,3555-3556,3559,3563,3570,3574-3575,3577-3590,3592-3603,3605-3629,3634-3638,3640,3643-3657,3659-3661,3663-3681,3684,3686-3687,3692,3695,3732-3734,3739,3742-3743,3745,3747-3748,3751,3753-3756,3761-3762,3785,3803,3820-3822,3825,3827-3836,3851-3864,3866,3871-3875,3879,3881-3885,3890-3892,3895-3896,3898-3900,3904,3912-3913,4022,4059,4132,4953,4955

Modified: branches/Release_2_2maint/jython/Lib/socket.py
===================================================================
--- branches/Release_2_2maint/jython/Lib/socket.py	2008-07-16 02:11:48 UTC (rev 4955)
+++ branches/Release_2_2maint/jython/Lib/socket.py	2008-07-16 02:13:48 UTC (rev 4956)
@@ -494,7 +494,7 @@
     else:
         return _udpsocket()
 
-def getaddrinfo(host, port, family=None, socktype=None, proto=None, flags=None):
+def getaddrinfo(host, port, family=None, socktype=None, proto=0, flags=None):
     try:
         if not family in [AF_INET, AF_INET6, AF_UNSPEC]:
             raise NotSupportedError()
@@ -510,7 +510,7 @@
         results = []
         for a in java.net.InetAddress.getAllByName(host):
             if len([f for f in filter_fns if f(a)]):
-                family = {java.net.Inet4Address: AF_INET, java.net.Inet6Address: AF_INET6}[a.class]
+                family = {java.net.Inet4Address: AF_INET, java.net.Inet6Address: AF_INET6}[a.getClass()]
                 # TODO: Include flowinfo and scopeid in a 4-tuple for IPv6 addresses
                 results.append( (family, socktype, proto, a.getCanonicalHostName(), (a.getHostAddress(), port)) )
         return results


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.