use atty instead of isatty (#8365)

Author: debris

Cargo.lock

@@ -21,7 +21,7 @@ semver = "0.9"
 ansi_term = "0.10"
 parking_lot = "0.5"
 regex = "0.2"
-isatty = "0.1"
+atty = "0.2.8"
 toml = "0.4"
 serde = "1.0"
 serde_json = "1.0"

Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Parity Technologies <[email protected]>"]
 [dependencies]
 log = "0.3"
 env_logger = "0.4"
-isatty = "0.1"
+atty = "0.2"
 lazy_static = "1.0"
 regex = "0.2"
 time = "0.1"

logger/Cargo.toml

@@ -16,23 +16,23 @@
 
 //! Logger for parity executables
 
+extern crate ansi_term;
 extern crate arrayvec;
+extern crate atty;
+extern crate env_logger;
 extern crate log as rlog;
-extern crate isatty;
+extern crate parking_lot;
 extern crate regex;
-extern crate env_logger;
 extern crate time;
+
 #[macro_use]
 extern crate lazy_static;
-extern crate parking_lot;
-extern crate ansi_term;
 
 mod rotating;
 
 use std::{env, thread, fs};
 use std::sync::{Weak, Arc};
 use std::io::Write;
-use isatty::{stderr_isatty, stdout_isatty};
 use env_logger::LogBuilder;
 use regex::Regex;
 use ansi_term::Colour;
@@ -86,7 +86,7 @@ pub fn setup_log(config: &Config) -> Result<Arc<RotatingLogger>, String> {
 		builder.parse(s);
 	}
 
-	let isatty = stderr_isatty();
+	let isatty = atty::is(atty::Stream::Stderr);
 	let enable_color = config.color && isatty;
 	let logs = Arc::new(RotatingLogger::new(levels));
 	let logger = logs.clone();
@@ -122,7 +122,7 @@ pub fn setup_log(config: &Config) -> Result<Arc<RotatingLogger>, String> {
 			let _ = file.write_all(b"\n");
 		}
 		logger.append(removed_color);
-		if !isatty && record.level() <= LogLevel::Info && stdout_isatty() {
+		if !isatty && record.level() <= LogLevel::Info && atty::is(atty::Stream::Stdout) {
 			// duplicate INFO/WARN output to console
 			println!("{}", ret);
 		}

logger/src/lib.rs

@@ -22,6 +22,7 @@ use std::sync::{Arc};
 use std::sync::atomic::{AtomicUsize, AtomicBool, Ordering as AtomicOrdering};
 use std::time::{Instant, Duration};
 
+use atty;
 use ethcore::client::{
 	BlockId, BlockChainClient, ChainInfo, BlockInfo, BlockChainInfo,
 	BlockQueueInfo, ChainNotify, ClientReport, Client, ClientIoMessage
@@ -31,7 +32,6 @@ use ethcore::snapshot::{RestorationStatus, SnapshotService as SS};
 use ethcore::snapshot::service::Service as SnapshotService;
 use sync::{LightSyncProvider, LightSync, SyncProvider, ManageNetwork};
 use io::{TimerToken, IoContext, IoHandler};
-use isatty::{stdout_isatty};
 use light::Cache as LightDataCache;
 use light::client::LightChainClient;
 use number_prefix::{binary_prefix, Standalone, Prefixed};
@@ -293,7 +293,7 @@ impl<T: InformantData> Informant<T> {
 
 		*self.last_tick.write() = Instant::now();
 
-		let paint = |c: Style, t: String| match self.with_color && stdout_isatty() {
+		let paint = |c: Style, t: String| match self.with_color && atty::is(atty::Stream::Stdout) {
 			true => format!("{}", c.paint(t)),
 			false => t,
 		};

parity/informant.rs

@@ -29,7 +29,7 @@ extern crate env_logger;
 extern crate fdlimit;
 extern crate futures;
 extern crate futures_cpupool;
-extern crate isatty;
+extern crate atty;
 extern crate jsonrpc_core;
 extern crate num_cpus;
 extern crate number_prefix;