OPSC-16690 Upgraded Jython version to 2.7.3 from frozen-mirror

.gitignore

@@ -7,6 +7,9 @@
 *.swp
 \#*
 *~
+
+.gradle
+
 # IntelliJ files
 *.eml
 *.ipr
@@ -30,10 +33,18 @@ nbbuild.xml
 .DS_Store
 .settings
 __pycache__
-ant.properties
 bin
+
+# Jython specific
+ant.properties
 build
+build2
 cachedir
+.jython_cache
 dist
-target
+publications
+reports
+jffi*.dll
+
 profile.txt
+out

.hgignore

@@ -8,6 +8,9 @@ syntax: glob
 *.swp
 \#*
 *~
+
+.gradle
+
 # IntelliJ files
 *.eml
 *.ipr
@@ -25,10 +28,18 @@ syntax: glob
 .DS_Store
 .settings
 __pycache__
-ant.properties
 bin
+
+# Jython specific
+ant.properties
 build
+build2
 cachedir
+.jython_cache
 dist
+publications
+reports
+jffi*.dll
+
 profile.txt
 out

.hgtags

@@ -101,3 +101,17 @@ d9660aa5cc8af0ce8c839b9712301c180cc4803e v2.7rc1
 44403bccae2163186f8ab46b4a544a48e137bba6 v2.7.1b1
 6c0da6893570f3ae3cd37a33189cae954e2afebb v2.7.1b2
 c3289f2a275446451605e586e5bef70092224184 v2.7.1b3
+03f4808038f8bbc246b6d6a022aecfde087eeb91 v2.7.1rc1
+03f4808038f8bbc246b6d6a022aecfde087eeb91 v2.7.1rc1
+330556fdad478b61f93a548643743c3d0214fd40 v2.7.1rc1
+850c2491cb25a54846ba0aedf70062074b12e673 v2.7.1rc2
+a5a06c9efdb6dd361d5f5c5c1ef07c2ac802e2e0 v2.7.1rc3
+a5a06c9efdb6dd361d5f5c5c1ef07c2ac802e2e0 v2.7.1rc3
+b6e989b788d563b8ecb0c0458ab486fca8d128d6 v2.7.1rc3
+dd7e191d4c90d9f5d5fe8f0840f186697ecf272a v2.7.1
+dfc49bafbe79566bd54c8d417829e001ff2316ea v2.7.2a1
+328e162ec1178fb38b81b342f84c1268bf21d7fb v2.7.2b1
+b9b60766cabebf007b7584ec21a69b3f58587525 v2.7.2b2
+6d3659465010fd2a8fb11a93953bae5bf9e9db80 v2.7.2b3
+1fcef1abf1d66abfef61a365d4fccef158d37fb7 v2.7.2rc1
+925a3cc3b49d8105688dfbec11fe68546b354169 v2.7.2

.travis.yml

@@ -1,45 +1,53 @@
 language: java
 
-notifications:
-  email:
-    recipients:
-      - [email protected]
-
-install: ant
+addons:
+  hostname: jyshort
 
-os:
-  - linux
-  - osx
+  homebrew: # only active on osx
+    update: true
+    packages:
+      - ant
 
-env:
-  matrix:
-    - CUSTOM_JDK="default"
-    - CUSTOM_JDK="oraclejdk7"
-    - CUSTOM_JDK="openjdk7"
 
 matrix:
-  exclude:
-     # On OSX, run with default JDK only.
-     - os: osx
-       env: CUSTOM_JDK="oraclejdk7"
-     - os: osx
-       env: CUSTOM_JDK="openjdk7"
-     # On Linux, run with specific JDKs only.
-     - os: linux
-       env: CUSTOM_JDK="default"
-
-before_install:
-  # Patch for buffer overflow bug, see https://github.com/travis-ci/travis-ci/issues/5227
-  - hostname
-  - cat /etc/hosts # optionally check the content *before*
-  - sudo hostname "$(hostname | cut -c1-63)"
-  - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
-  - hostname
-  - cat /etc/hosts # optionally check the content *after*
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install ant; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then jdk_switcher use "$CUSTOM_JDK"; fi
-
-script: ant && ant regrtest-travis
+  include:
+    - os: linux
+      dist: xenial
+      addons:
+        apt:
+          packages:
+            - ant
+      jdk: openjdk8
+
+    - os: linux
+      dist: xenial
+      addons:
+        apt:
+          packages:
+            - ant
+      jdk: openjdk11
+
+    - os: linux
+      dist: xenial
+      addons:
+        apt:
+          packages:
+            - ant
+      jdk: openjdk12
+
+    - os: osx
+      osx_image: xcode9.3 # Last supporting Java 8
+      jdk: oraclejdk8
+
+
+install:
+  - ant developer-build
+
+
+script:
+  - ant regrtest-travis
 
+notifications:
+  email:
+    recipients:
+      - [email protected]

ACKNOWLEDGMENTS

@@ -3,7 +3,7 @@ ACKNOWLEDGMENTS
 
 Jython: Python for the Java Platform
 
-Copyright (c) 2000-2016 Jython Developers.
+Copyright (c) 2000-2018 Jython Developers.
 All rights reserved.
 
 Copyright (c) 2000 BeOpen.com.
@@ -31,7 +31,7 @@ Jython links the following libraries:
 * Jar Jar Links, licensed under the Apache 2.0 License from Tonic Systems
 * Java Native Runtime, licensed under the Common Public License
 * JLine2, licensed under a BSD license
-* JUnit, licenseed under Eclipse Public License 1.0 from the JUnit project
+* JUnit, licensed under Eclipse Public License 1.0 from the JUnit project
 * Mock Runner, licensed under the Apache 1.1 license
 * Netty 4, licensed under the Apache 2.0 license from the Netty project
 * PyPy datetime module, licensed under the MIT License from the PyPy project
@@ -176,6 +176,16 @@ Jython in ways large and small, in no particular order:
     Nick Bailey
     Doug Clayton
     Carl Wicklow
+    James Mudd
+    Mat Booth
+    Alex Gaman
+    Tom Bech
+    Richie Bendall
+    Raymond Ferguson
+    yishenggudou (愧僧)
+    Andrew Kuchling
+    Jim Peterson
+    Christian Clauss
 
 Local Variables:
 mode: indented-text

CPythonLib.includes

@@ -110,6 +110,7 @@ mutex.py
 netrc.py
 nntplib.py
 numbers.py
+ntpath.py
 nturl2path.py
 opcode.py
 optparse.py

CoreExposed.includes

@@ -1,5 +1,7 @@
 org/python/core/AstList.class
 org/python/core/ClasspathPyImporter.class
+org/python/core/FloatInfo.class
+org/python/core/LongInfo.class
 org/python/core/Py2kBuffer.class
 org/python/core/PyArray.class
 org/python/core/PyBaseString.class
@@ -37,9 +39,11 @@ org/python/core/PyMethod.class
 org/python/core/PyMethodDescr.class
 org/python/core/PyModule.class
 org/python/core/PyNone.class
+org/python/core/PyNullImporter.class
 org/python/core/PyObject.class
 org/python/core/PyProperty.class
 org/python/core/PySet.class
+org/python/core/PyShadowString.class
 org/python/core/PySlice.class
 org/python/core/PySlot.class
 org/python/core/PyStaticMethod.class
@@ -53,6 +57,8 @@ org/python/core/PyType.class
 org/python/core/PyUnicode.class
 org/python/core/PyVersionInfo.class
 org/python/core/PyXRange.class
+org/python/core/PyXRangeIter.class
+org/python/core/WinVersion.class
 org/python/core/stringlib/MarkupIterator.class
 org/python/core/stringlib/FieldNameIterator.class
 org/python/modules/PyStruct.class
@@ -68,6 +74,8 @@ org/python/modules/_io/PyRawIOBase.class
 org/python/modules/_io/PyFileIO.class
 org/python/modules/_functools/PyPartial.class
 org/python/modules/_hashlib$Hash.class
+org/python/modules/_json/Encoder.class
+org/python/modules/_json/Scanner.class
 org/python/modules/bz2/PyBZ2File.class
 org/python/modules/bz2/PyBZ2Compressor.class
 org/python/modules/bz2/PyBZ2Decompressor.class
@@ -81,6 +89,7 @@ org/python/modules/itertools/dropwhile.class
 org/python/modules/itertools/groupby.class
 org/python/modules/itertools/ifilterfalse.class
 org/python/modules/itertools/ifilter.class
+org/python/modules/itertools/imap.class
 org/python/modules/itertools/islice.class
 org/python/modules/itertools/izip.class
 org/python/modules/itertools/izipLongest.class
@@ -95,6 +104,7 @@ org/python/modules/jffi/ByReference.class
 org/python/modules/jffi/CData.class
 org/python/modules/jffi/CType.class
 org/python/modules/jffi/CType$Array.class
+org/python/modules/jffi/CType$Custom.class
 org/python/modules/jffi/CType$Pointer.class
 org/python/modules/jffi/DynamicLibrary.class
 org/python/modules/jffi/DynamicLibrary$Symbol.class
@@ -166,6 +176,8 @@ org/python/antlr/ast/Print.class
 org/python/antlr/ast/Raise.class
 org/python/antlr/ast/Repr.class
 org/python/antlr/ast/Return.class
+org/python/antlr/ast/Set.class
+org/python/antlr/ast/SetComp.class
 org/python/antlr/ast/Slice.class
 org/python/antlr/ast/Str.class
 org/python/antlr/ast/Subscript.class

Demo/applet/deprecated/ButtonDemo.py

@@ -6,27 +6,28 @@
 
 from java import awt, applet
 
+
 class ButtonDemo(applet.Applet):
     def init(self):
-	self.b1 = awt.Button('Disable middle button',
-			     actionPerformed=self.disable)
-	self.b2 = awt.Button('Middle button')
-	self.b3 = awt.Button('Enable middle button',
-			     enabled=0, actionPerformed=self.enable)
+        self.b1 = awt.Button('Disable middle button',
+                             actionPerformed=self.disable)
+        self.b2 = awt.Button('Middle button')
+        self.b3 = awt.Button('Enable middle button',
+                             enabled=0, actionPerformed=self.enable)
 
-	self.add(self.b1)
-	self.add(self.b2)
-	self.add(self.b3)
+        self.add(self.b1)
+        self.add(self.b2)
+        self.add(self.b3)
 
     def enable(self, event):
-	self.b1.enabled = self.b2.enabled = 1
-	self.b3.enabled = 0
+        self.b1.enabled = self.b2.enabled = 1
+        self.b3.enabled = 0
 
     def disable(self, event):
-	self.b1.enabled = self.b2.enabled = 0
-	self.b3.enabled = 1
+        self.b1.enabled = self.b2.enabled = 0
+        self.b3.enabled = 1
 
 
-if __name__ == '__main__':	
+if __name__ == '__main__':
     import pawt
     pawt.test(ButtonDemo())

Demo/applet/deprecated/ButtonFontDemo.py

@@ -6,28 +6,29 @@
 
 from java import awt, applet
 
+
 class ButtonFontDemo(applet.Applet):
     def init(self):
-	self.font = awt.Font('Serif', 0, 24)
-	self.b1 = awt.Button('Disable middle button',
-			     actionPerformed=self.disable)
-	self.b2 = awt.Button('Middle button')
-	self.b3 = awt.Button('Enable middle button',
-			     enabled=0, actionPerformed=self.enable)
+        self.font = awt.Font('Serif', 0, 24)
+        self.b1 = awt.Button('Disable middle button',
+                             actionPerformed=self.disable)
+        self.b2 = awt.Button('Middle button')
+        self.b3 = awt.Button('Enable middle button',
+                             enabled=0, actionPerformed=self.enable)
 
-	self.add(self.b1)
-	self.add(self.b2)
-	self.add(self.b3)
+        self.add(self.b1)
+        self.add(self.b2)
+        self.add(self.b3)
 
     def enable(self, event):
-	self.b1.enabled = self.b2.enabled = 1
-	self.b3.enabled = 0
+        self.b1.enabled = self.b2.enabled = 1
+        self.b3.enabled = 0
 
     def disable(self, event):
-	self.b1.enabled = self.b2.enabled = 0
-	self.b3.enabled = 1
+        self.b1.enabled = self.b2.enabled = 0
+        self.b3.enabled = 1
 
 
-if __name__ == '__main__':	
+if __name__ == '__main__':
     import pawt
     pawt.test(ButtonFontDemo())