Update xstream.

fabioz · Oct 29, 2023 · a9cf1c5 · a9cf1c5
1 parent 57113e9
commit a9cf1c5
Show file tree

Hide file tree

Showing 20 changed files with 34 additions and 554 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,3 +54,4 @@ plugins/org.python.pydev.core/pysrc/.settings
 **/v2_indexcache/**
 plugins/com.python.pydev.runalltests/fake_homedir*
 .cache
+/__pycache__/
diff --git a/.travis.yml b/.travis.yml
diff --git a/builders/org.python.pydev.build/add_tests_to_plugins.py b/builders/org.python.pydev.build/add_tests_to_plugins.py
@@ -69,10 +69,10 @@ def main():
                     manifest = plugin_dir / 'META-INF' / 'MANIFEST.MF'
                     txt = manifest.read_text('utf-8')
                     assert txt.count('Bundle-ClassPath: refactoring.jar') == 1
-                    assert 'tests/lib/xstream-1.4.4.jar' not in txt
+                    assert 'tests/lib/xstream-1.4.20.jar' not in txt
                     txt = txt.replace('Bundle-ClassPath: refactoring.jar', '''Bundle-ClassPath: refactoring.jar,
  tests/lib/xpp3-1.1.3.4.O.jar,
- tests/lib/xstream-1.4.4.jar,
+ tests/lib/xstream-1.4.20.jar,
  contrib/ch/hsr/ukistler/astgraph/jgraph-5.8.3.1.jar''')
                     manifest.write_text(txt, 'utf-8')
                     print('Writing', manifest)
@@ -83,7 +83,7 @@ def main():
                     classpath.write_text(txt, 'utf-8')
                     print('Writing', classpath)
 
-                    properties['jars.extra.classpath'] = 'contrib/ch/hsr/ukistler/astgraph/jgraph-5.8.3.1.jar,tests/lib/xpp3-1.1.3.4.O.jar,tests/lib/xstream-1.4.4.jar'
+                    properties['jars.extra.classpath'] = 'contrib/ch/hsr/ukistler/astgraph/jgraph-5.8.3.1.jar,tests/lib/xpp3-1.1.3.4.O.jar,tests/lib/xstream-1.4.20.jar'
 
                 print('Updating', build_properties)
                 with build_properties.open('w') as fp:

diff --git a/make_s3cfg.sh b/make_s3cfg.sh
diff --git a/plugins/org.python.pydev.refactoring/.classpath b/plugins/org.python.pydev.refactoring/.classpath
@@ -7,7 +7,7 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="lib" path="contrib/ch/hsr/ukistler/astgraph/jgraph-5.8.3.1.jar"/>
 	<classpathentry kind="lib" path="tests/lib/xpp3-1.1.3.4.O.jar"/>
-	<classpathentry kind="lib" path="tests/lib/xstream-1.4.4.jar"/>
+	<classpathentry kind="lib" path="tests/lib/xstream-1.4.20.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.python.pydev.refactoring/tests/lib/xstream-1.4.20.jar b/plugins/org.python.pydev.refactoring/tests/lib/xstream-1.4.20.jar
diff --git a/plugins/org.python.pydev.refactoring/tests/lib/xstream-1.4.4.jar b/plugins/org.python.pydev.refactoring/tests/lib/xstream-1.4.4.jar
diff --git a/...v.refactoring/tests/org/python/pydev/refactoring/tests/adapter/ModuleAdapterTestCase.java b/...v.refactoring/tests/org/python/pydev/refactoring/tests/adapter/ModuleAdapterTestCase.java
@@ -14,7 +14,7 @@
 * Contributors:
 *     Fabio Zadrozny <[email protected]> - initial implementation
 ******************************************************************************/
-/* 
+/*
  * Copyright (C) 2006, 2007  Dennis Hunziker, Ueli Kistler
  * Copyright (C) 2007  Reto Schuettel, Robin Stocker
  */
@@ -41,6 +41,10 @@ public void runTest() throws Throwable {
 
         ModuleAdapterTestConfig config = null;
         XStream xstream = new XStream();
+        XStream.setupDefaultSecurity(xstream);
+        xstream.allowTypesByWildcard(new String[] {
+                "org.python.pydev.**"
+        });
         xstream.alias("config", ModuleAdapterTestConfig.class);
 
         ModuleAdapter module = VisitorFactory.createModuleAdapter(null, null, new Document(data.source),

diff --git a/...thon/pydev/refactoring/tests/codegenerator/constructorfield/ConstructorFieldTestCase.java b/...thon/pydev/refactoring/tests/codegenerator/constructorfield/ConstructorFieldTestCase.java
@@ -76,6 +76,10 @@ private MockupConstructorFieldRequestProcessor setupRequestProcessor(MockupConst
     private MockupConstructorFieldConfig initConfig() {
         MockupConstructorFieldConfig config = null;
         XStream xstream = new XStream();
+        XStream.setupDefaultSecurity(xstream);
+        xstream.allowTypesByWildcard(new String[] {
+                "org.python.pydev.**"
+        });
         xstream.alias("config", MockupConstructorFieldConfig.class);
 
         if (data.config.length() > 0) {

diff --git a/.../pydev/refactoring/tests/codegenerator/generateproperties/GeneratePropertiesTestCase.java b/.../pydev/refactoring/tests/codegenerator/generateproperties/GeneratePropertiesTestCase.java
@@ -103,6 +103,10 @@ private MockupGeneratePropertiesRequestProcessor setupRequestProcessor(MockupGen
     private MockupGeneratePropertiesConfig initConfig() {
         MockupGeneratePropertiesConfig config = null;
         XStream xstream = new XStream();
+        XStream.setupDefaultSecurity(xstream);
+        xstream.allowTypesByWildcard(new String[] {
+                "org.python.pydev.**"
+        });
         xstream.alias("config", MockupGeneratePropertiesConfig.class);
 
         if (data.config.length() > 0) {

diff --git a/...python/pydev/refactoring/tests/codegenerator/overridemethods/OverrideMethodsTestCase.java b/...python/pydev/refactoring/tests/codegenerator/overridemethods/OverrideMethodsTestCase.java
@@ -79,6 +79,10 @@ private MockupOverrideMethodsRequestProcessor setupRequestProcessor(MockupOverri
     private MockupOverrideMethodsConfig initConfig() {
         MockupOverrideMethodsConfig config = null;
         XStream xstream = new XStream();
+        XStream.setupDefaultSecurity(xstream);
+        xstream.allowTypesByWildcard(new String[] {
+                "org.python.pydev.**"
+        });
         xstream.alias("config", MockupOverrideMethodsConfig.class);
 
         if (data.config.length() > 0) {

diff --git a/...g/python/pydev/refactoring/tests/coderefactoring/extractmethod/ExtractMethodTestCase.java b/...g/python/pydev/refactoring/tests/coderefactoring/extractmethod/ExtractMethodTestCase.java
@@ -136,6 +136,10 @@ private MockupExtractMethodRequestProcessor setupRequestProcessor(MockupExtractM
     private MockupExtractMethodConfig initConfig() {
         MockupExtractMethodConfig config = null;
         XStream xstream = new XStream();
+        XStream.setupDefaultSecurity(xstream);
+        xstream.allowTypesByWildcard(new String[] {
+                "org.python.pydev.**"
+        });
         xstream.alias("config", MockupExtractMethodConfig.class);
 
         if (data.config.length() > 0) {

diff --git a/...ctoring/tests/org/python/pydev/refactoring/tests/visitors/SelectionExtensionTestCase.java b/...ctoring/tests/org/python/pydev/refactoring/tests/visitors/SelectionExtensionTestCase.java
@@ -108,6 +108,11 @@ public AdditionalGrammarVersionsToCheck getAdditionalGrammarVersions() throws Mi
     private MockupSelectionConfig initConfig() {
         MockupSelectionConfig config = null;
         XStream xstream = new XStream();
+        XStream.setupDefaultSecurity(xstream);
+        xstream.allowTypesByWildcard(new String[] {
+                "org.python.pydev.**"
+        });
+
         xstream.alias("config", MockupSelectionConfig.class);
 
         if (data.config.length() > 0) {

diff --git a/...sts_completions/org/python/pydev/ast/codecompletion/PythonCompletionWithBuiltinsTest.java b/...sts_completions/org/python/pydev/ast/codecompletion/PythonCompletionWithBuiltinsTest.java
@@ -159,7 +159,7 @@ public void testRecursion() throws FileNotFoundException, Exception, CompletionR
         } catch (CompletionRecursionException e) {
             //that's ok... we're asking for it here...
         }
-        requestCompl(f, strDoc, strDoc.length(), -1, new String[] { "args", "with_traceback(tb)" });
+        requestCompl(f, strDoc, strDoc.length(), -1, new String[] { "args", "with_traceback(self, tb)" });
     }
 
     public void testCompleteImportBuiltin() throws BadLocationException, IOException, Exception {
@@ -236,12 +236,12 @@ public void testBuiltinsInNamespace1() throws BadLocationException, IOException,
 
     public void testBuiltinsInNamespace2() throws BadLocationException, IOException, Exception {
         String s = "__builtins__.RuntimeError.";
-        requestCompl(s, s.length(), 2, new String[] { "args", "with_traceback(tb)" });
+        requestCompl(s, s.length(), 2, new String[] { "args", "with_traceback(self, tb)" });
     }
 
     public void testBuiltinsInNamespace2Underline() throws BadLocationException, IOException, Exception {
         String s = "__builtins__.RuntimeError._";
-        requestCompl(s, s.length(), -1, new String[] { "__doc__", "__init__()", "__str__()" });
+        requestCompl(s, s.length(), -1, new String[] { "__doc__", "__init__(self)", "__str__(self)" });
     }
 
     public void testPreferForcedBuiltin() throws BadLocationException, IOException, Exception {

diff --git a/rootproject/.project b/rootproject/.project
@@ -25,11 +25,6 @@
 			<type>1</type>
 			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/.gitignore</locationURI>
 		</link>
-		<link>
-			<name>.travis.yml</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/.travis.yml</locationURI>
-		</link>
 		<link>
 			<name>LICENSE.txt</name>
 			<type>1</type>
@@ -55,11 +50,6 @@
 			<type>1</type>
 			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/make_release.py</locationURI>
 		</link>
-		<link>
-			<name>make_s3cfg.sh</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/make_s3cfg.sh</locationURI>
-		</link>
 		<link>
 			<name>pom.xml</name>
 			<type>1</type>
@@ -70,31 +60,6 @@
 			<type>2</type>
 			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/report</locationURI>
 		</link>
-		<link>
-			<name>test_with_tycho.patch</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/test_with_tycho.patch</locationURI>
-		</link>
-		<link>
-			<name>travis.TODO</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/travis.TODO</locationURI>
-		</link>
-		<link>
-			<name>travisdeps.sh</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/travisdeps.sh</locationURI>
-		</link>
-		<link>
-			<name>travisgetkeystore.sh</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/travisgetkeystore.sh</locationURI>
-		</link>
-		<link>
-			<name>travisupload.sh</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/travisupload.sh</locationURI>
-		</link>
 		<link>
 			<name>update_version.py</name>
 			<type>1</type>