| 
31 | 31 | #  | 
32 | 32 | #    <see CVS and SVN checkin messages for history>  | 
33 | 33 | #  | 
 | 34 | +#    1.1.0 - removed deprecated java_ver() function  | 
34 | 35 | #    1.0.9 - added invalidate_caches() function to invalidate cached values  | 
35 | 36 | #    1.0.8 - changed Windows support to read version from kernel32.dll  | 
36 | 37 | #    1.0.7 - added DEV_NULL  | 
 | 
110 | 111 | 
  | 
111 | 112 | """  | 
112 | 113 | 
 
  | 
113 |  | -__version__ = '1.0.9'  | 
 | 114 | +__version__ = '1.1.0'  | 
114 | 115 | 
 
  | 
115 | 116 | import collections  | 
116 | 117 | import os  | 
@@ -528,53 +529,6 @@ def ios_ver(system="", release="", model="", is_simulator=False):  | 
528 | 529 |     return IOSVersionInfo(system, release, model, is_simulator)  | 
529 | 530 | 
 
  | 
530 | 531 | 
 
  | 
531 |  | -def _java_getprop(name, default):  | 
532 |  | -    """This private helper is deprecated in 3.13 and will be removed in 3.15"""  | 
533 |  | -    from java.lang import System  | 
534 |  | -    try:  | 
535 |  | -        value = System.getProperty(name)  | 
536 |  | -        if value is None:  | 
537 |  | -            return default  | 
538 |  | -        return value  | 
539 |  | -    except AttributeError:  | 
540 |  | -        return default  | 
541 |  | - | 
542 |  | -def java_ver(release='', vendor='', vminfo=('', '', ''), osinfo=('', '', '')):  | 
543 |  | - | 
544 |  | -    """ Version interface for Jython.  | 
545 |  | -
  | 
546 |  | -        Returns a tuple (release, vendor, vminfo, osinfo) with vminfo being  | 
547 |  | -        a tuple (vm_name, vm_release, vm_vendor) and osinfo being a  | 
548 |  | -        tuple (os_name, os_version, os_arch).  | 
549 |  | -
  | 
550 |  | -        Values which cannot be determined are set to the defaults  | 
551 |  | -        given as parameters (which all default to '').  | 
552 |  | -
  | 
553 |  | -    """  | 
554 |  | -    import warnings  | 
555 |  | -    warnings._deprecated('java_ver', remove=(3, 15))  | 
556 |  | -    # Import the needed APIs  | 
557 |  | -    try:  | 
558 |  | -        import java.lang  # noqa: F401  | 
559 |  | -    except ImportError:  | 
560 |  | -        return release, vendor, vminfo, osinfo  | 
561 |  | - | 
562 |  | -    vendor = _java_getprop('java.vendor', vendor)  | 
563 |  | -    release = _java_getprop('java.version', release)  | 
564 |  | -    vm_name, vm_release, vm_vendor = vminfo  | 
565 |  | -    vm_name = _java_getprop('java.vm.name', vm_name)  | 
566 |  | -    vm_vendor = _java_getprop('java.vm.vendor', vm_vendor)  | 
567 |  | -    vm_release = _java_getprop('java.vm.version', vm_release)  | 
568 |  | -    vminfo = vm_name, vm_release, vm_vendor  | 
569 |  | -    os_name, os_version, os_arch = osinfo  | 
570 |  | -    os_arch = _java_getprop('java.os.arch', os_arch)  | 
571 |  | -    os_name = _java_getprop('java.os.name', os_name)  | 
572 |  | -    os_version = _java_getprop('java.os.version', os_version)  | 
573 |  | -    osinfo = os_name, os_version, os_arch  | 
574 |  | - | 
575 |  | -    return release, vendor, vminfo, osinfo  | 
576 |  | - | 
577 |  | - | 
578 | 532 | AndroidVer = collections.namedtuple(  | 
579 | 533 |     "AndroidVer", "release api_level manufacturer model device is_emulator")  | 
580 | 534 | 
 
  | 
@@ -1034,13 +988,6 @@ def uname():  | 
1034 | 988 |                     version = '16bit'  | 
1035 | 989 |             system = 'Windows'  | 
1036 | 990 | 
 
  | 
1037 |  | -        elif system[:4] == 'java':  | 
1038 |  | -            release, vendor, vminfo, osinfo = java_ver()  | 
1039 |  | -            system = 'Java'  | 
1040 |  | -            version = ', '.join(vminfo)  | 
1041 |  | -            if not version:  | 
1042 |  | -                version = vendor  | 
1043 |  | - | 
1044 | 991 |     # System specific extensions  | 
1045 | 992 |     if system == 'OpenVMS':  | 
1046 | 993 |         # OpenVMS seems to have release and version mixed up  | 
@@ -1370,15 +1317,6 @@ def platform(aliased=False, terse=False):  | 
1370 | 1317 |         platform = _platform(system, release, machine, processor,  | 
1371 | 1318 |                              'with',  | 
1372 | 1319 |                              libcname+libcversion)  | 
1373 |  | -    elif system == 'Java':  | 
1374 |  | -        # Java platforms  | 
1375 |  | -        r, v, vminfo, (os_name, os_version, os_arch) = java_ver()  | 
1376 |  | -        if terse or not os_name:  | 
1377 |  | -            platform = _platform(system, release, version)  | 
1378 |  | -        else:  | 
1379 |  | -            platform = _platform(system, release, version,  | 
1380 |  | -                                 'on',  | 
1381 |  | -                                 os_name, os_version, os_arch)  | 
1382 | 1320 | 
 
  | 
1383 | 1321 |     else:  | 
1384 | 1322 |         # Generic handler  | 
 | 
0 commit comments