|
29 | 29 | # |
30 | 30 | # History: |
31 | 31 | # |
32 | | -# <see CVS and SVN checkin messages for history> |
| 32 | +# <see checkin messages for history> |
33 | 33 | # |
34 | 34 | # 1.0.9 - added invalidate_caches() function to invalidate cached values |
35 | 35 | # 1.0.8 - changed Windows support to read version from kernel32.dll |
|
110 | 110 |
|
111 | 111 | """ |
112 | 112 |
|
113 | | -__version__ = '1.0.9' |
| 113 | +__version__ = '1.1.0' |
114 | 114 |
|
115 | 115 | import collections |
116 | 116 | import os |
@@ -528,53 +528,6 @@ def ios_ver(system="", release="", model="", is_simulator=False): |
528 | 528 | return IOSVersionInfo(system, release, model, is_simulator) |
529 | 529 |
|
530 | 530 |
|
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 | 531 | AndroidVer = collections.namedtuple( |
579 | 532 | "AndroidVer", "release api_level manufacturer model device is_emulator") |
580 | 533 |
|
@@ -1034,13 +987,6 @@ def uname(): |
1034 | 987 | version = '16bit' |
1035 | 988 | system = 'Windows' |
1036 | 989 |
|
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 | 990 | # System specific extensions |
1045 | 991 | if system == 'OpenVMS': |
1046 | 992 | # OpenVMS seems to have release and version mixed up |
@@ -1370,15 +1316,6 @@ def platform(aliased=False, terse=False): |
1370 | 1316 | platform = _platform(system, release, machine, processor, |
1371 | 1317 | 'with', |
1372 | 1318 | 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 | 1319 |
|
1383 | 1320 | else: |
1384 | 1321 | # Generic handler |
|
0 commit comments