Skip to content

Commit 80b5328

Browse files
committed
Cleaning code of JBangIntegration.
1 parent bc7a21e commit 80b5328

File tree

1 file changed

+4
-22
lines changed
  • graalpython/org.graalvm.python.embedding.utils/src/org/graalvm/python/embedding/utils/jbang

1 file changed

+4
-22
lines changed

graalpython/org.graalvm.python.embedding.utils/src/org/graalvm/python/embedding/utils/jbang/JBangIntegration.java

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,30 +42,12 @@
4242
package org.graalvm.python.embedding.utils.jbang;
4343

4444
import java.io.BufferedReader;
45-
import java.io.File;
46-
import java.io.FileWriter;
47-
import java.io.IOException;
48-
import java.nio.file.Files;
49-
import java.nio.file.Path;
50-
import java.nio.file.Paths;
51-
import java.nio.file.attribute.PosixFilePermission;
52-
import java.util.ArrayList;
53-
import java.util.Arrays;
54-
import java.util.Comparator;
55-
import java.util.Collection;
56-
import java.util.HashSet;
57-
import java.util.List;
58-
import java.util.Map;
59-
import java.util.HashMap;
60-
import java.util.Map.Entry;
61-
import java.util.stream.Collectors;
6245

6346
import java.io.File;
6447
import java.io.FileWriter;
6548
import java.io.IOException;
6649
import java.io.InputStream;
6750
import java.io.InputStreamReader;
68-
import java.io.OutputStream;
6951
import java.net.Proxy;
7052
import java.net.Proxy.Type;
7153
import java.net.ProxySelector;
@@ -201,7 +183,7 @@ private static void generateFilelist(Path vfs) {
201183
} catch (IOException e) {
202184
throw new RuntimeException(e);
203185
}
204-
String[] a = ret.toArray(new String[ret.size()]);
186+
String[] a = ret.toArray(String[]::new);
205187
Arrays.sort(a);
206188
try (var wr = new FileWriter(filesList.toFile())) {
207189
for (String f : a) {
@@ -316,7 +298,7 @@ private static void runPip(Path venvDirectory, String command, String pkg) {
316298
var newArgs = new ArrayList<String>();
317299
newArgs.add("-m");
318300
newArgs.add("pip");
319-
// addProxy(newArgs);
301+
addProxy(newArgs);
320302
newArgs.add(command);
321303
newArgs.add(pkg);
322304

@@ -412,8 +394,8 @@ private static void runProcess(ProcessBuilder pb) {
412394
/**
413395
* Ensures that the proxy url has a protocol.
414396
*
415-
* @param proxyAddress proxy server address
416-
* @param protocol usually http or https
397+
* @param proxyAddress proxy server address
398+
* @param protocol usually http or https
417399
* @return String representation of url of the proxy
418400
*/
419401
private static String fixProtocol(String proxyAddress, String protocol) {

0 commit comments

Comments
 (0)