From ea63693891e41e48ad072ba16ad12a0097e68c03 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Tue, 21 Nov 2017 17:01:34 +0100
Subject: [PATCH] Minor fixes.
---
.../oracle/truffle/r/engine/shell/EmbeddedConsoleHandler.java | 2 +-
mx.fastr/mx_fastr_pkgs.py | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/EmbeddedConsoleHandler.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/EmbeddedConsoleHandler.java
index df5ee9b5ec..5b9c747e20 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/EmbeddedConsoleHandler.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/EmbeddedConsoleHandler.java
@@ -59,7 +59,7 @@ public class EmbeddedConsoleHandler extends ConsoleHandler {
rEmbedRFFI = RFFIFactory.getREmbedRFFI();
if (!(RInterfaceCallbacks.R_WriteConsole.isOverridden() || RInterfaceCallbacks.R_ReadConsole.isOverridden())) {
if (startParams.noReadline()) {
- delegate = new DefaultConsoleHandler(System.in, System.out);
+ delegate = new DefaultConsoleHandler(System.in, System.out, false);
} else {
delegate = new JLineConsoleHandler(System.in, System.out, startParams.isSlave());
}
diff --git a/mx.fastr/mx_fastr_pkgs.py b/mx.fastr/mx_fastr_pkgs.py
index c4aa6fbea8..d2b20462f6 100644
--- a/mx.fastr/mx_fastr_pkgs.py
+++ b/mx.fastr/mx_fastr_pkgs.py
@@ -33,7 +33,6 @@ In either case all the output is placed in the fastr suite dir. Separate directo
and tests, namely 'lib.install.packages.{fastr,gnur}' and 'test.{fastr,gnur}' (sh syntax).
'''
from os.path import join, relpath
-from os import walk
from datetime import datetime
import shutil, os, re
import subprocess
@@ -61,7 +60,6 @@ def _gnur_include_path():
return _mx_gnur().extensions._gnur_include_path()
else:
gnur_include_p = join(mx_fastr._gnur_path(), "include")
- print("Using GNUR include path: {0}".format(gnur_include_p))
return gnur_include_p
def _fastr_include_path():
@@ -654,7 +652,7 @@ def computeApiChecksum(includeDir):
'''
m = hashlib.sha256()
rootDir = includeDir
- for root, dirs, files in os.walk(rootDir):
+ for root, _, files in os.walk(rootDir):
mx.logvv("Visiting directory {0}".format(root))
for f in files:
fileName = join(root, f)
--
GitLab