cleaned up dialoguer package

3 files changed, 15 insertions, 49 deletions

diff --git a/dialoguer/__init__.py b/dialoguer/__init__.py
index 8c87089..5219dde 100644
--- a/dialoguer/__init__.py
+++ b/dialoguer/__init__.py
@@ -65,12 +65,9 @@ class Dialogue:
 			data_type_name = type(data)
 			data_type_name = data_type_name.__name__
 			data_type_name = bin_conv(data_type_name)
-			print('data_type_name', data_type_name)
 			self.conn.send(data_type_name)
 			recv_chk = self.recv(set_data_type=bool)
-			print('recv_chk', recv_chk)
 		bin_data = bin_conv(data)
-		# bin_data = bytes(data, 'utf-8')
 		self.conn.send(bin_data)
 
 	# I still want to consolidate the recv_data_type and set_data_type args
@@ -99,30 +96,21 @@ class Dialogue:
 		return val
 
 	def evaluate_expression(self, method_name, *args, **kwargs):
-		
-		print('cmd_int', 2)
 		self.send(2)
-		print('cmd_int', 2)
 		recv_chk = self.recv(set_data_type=bool)
-		print('recv_chk', recv_chk)
 		#send number of arguments
 		self.send(len(args))
 		recv_chk = self.recv(set_data_type=bool)
-		print('recv_chk', recv_chk)
 		#send number of keyword arguments
 		self.send(len(kwargs))
 		recv_chk = self.recv(set_data_type=bool)
-		print('recv_chk', recv_chk)
 		#send method name
 		self.send(method_name)
 		recv_chk = self.recv(set_data_type=bool)
-		print('recv_chk', recv_chk)
 		#send arguments
-		#print('args', args)
 		for arg in args:
 			self.send(arg, True)
 			recv_chk = self.recv(set_data_type=bool)
-			#print('recv_chk', recv_chk)
 		#send keyword arguments
 		for kw in kwargs:
 			self.send(kw)
diff --git a/dialoguer/binary_conversion.py b/dialoguer/binary_conversion.py
index 73400d6..4b8a30a 100644
--- a/dialoguer/binary_conversion.py
+++ b/dialoguer/binary_conversion.py
@@ -5,18 +5,6 @@ def bin_conv(data, data_type = None):
 		conv_data = bytes(data, 'utf-8')
 	elif type(data) == int and data_type == None:
 		conv_data = data.to_bytes(32, 'little')
-		#print(conv_data)
-		# conv_data = bin(data)
-		# conv_data = conv_data.lstrip('0b')
-		# conv_data = conv_data.zfill(8)
-		# conv_data = ''.join(reversed(conv_data))
-		# n = b''
-		# for b in conv_data:
-		# 	m = int(b)
-		# 	m = chr(m)
-		# 	m = bytes(m, 'utf-8')
-		# 	n += m
-		# conv_data = n
 	
 	#convert from binary 
 	elif type(data) == bytes and data_type == str:
diff --git a/dialoguer/context_script.r b/dialoguer/context_script.r
index 50471ef..f2a795a 100644
--- a/dialoguer/context_script.r
+++ b/dialoguer/context_script.r
@@ -7,21 +7,21 @@ UUID <- commandArgs(trailingOnly = TRUE)[1]
 TARGET_FILE <- commandArgs(trailingOnly = TRUE)[2]
 
 data_type_vect <- c(
-	character = 'character',
-	str = 'character',
-	integer = 'integer',
-	int = 'integer',
-	double = 'double',
-	float = 'double',
-	logical = 'logical',
-	bool = 'logical'
+	character = "character",
+	str = "character",
+	integer = "integer",
+	int = "integer",
+	double = "double",
+	float = "double",
+	logical = "logical",
+	bool = "logical"
 )
 
 display_msg <- function(...) {
-	cat('\033[94m')
+	cat("\033[94m")
 	cat(
         ...,
-        end = '\033[0m\n'
+        end = "\033[0m\n"
     )
 }
 
@@ -38,15 +38,12 @@ send <- function(conn, data, send_data_type = FALSE) {
 # I still want to consolidate the recv_data_type and set_data_type args
 recv <- function(conn, recv_data_type = FALSE, set_data_type = "character") {
 	if (recv_data_type) {
-		suppressWarnings(data_type_bin <- readBin(conn, "raw", HEADER))
-		while (length(data_type_bin) == 0) {
-			suppressWarnings(data_type_bin <- readBin(conn, "raw", HEADER))
+		suppressWarnings(data_type <- readBin(conn, "raw", HEADER))
+		while (length(data_type) == 0) {
+			suppressWarnings(data_type <- readBin(conn, "raw", HEADER))
 		}
-		display_msg('data_type_bin', data_type_bin)
-		data_type_name <- readBin(data_type_bin, "character")
-		display_msg('data_type_name', data_type_name, '-')
-		data_type <- data_type_vect[data_type_name]
-		display_msg('data_type', data_type)
+		data_type <- readBin(data_type, "character")
+		data_type <- data_type_vect[data_type]
 		send(con, TRUE)
 	} else {
 		data_type <- set_data_type
@@ -90,24 +87,18 @@ import_variable <- function() {
 
 evaluate_expression <- function() {
 	arg_count <- recv(con, FALSE, "integer")
-	display_msg('arg_count', arg_count)
 	send(con, TRUE)
 	kwarg_count <- recv(con, FALSE, "integer")
 	send(con, TRUE)
 	method_name <- recv(con, FALSE, "character")
-	display_msg('method_name', method_name)
 	send(con, TRUE)
 	args <- list()
-	#display_msg('args', args)
 	if (arg_count > 0) {
 		for (i in 1:arg_count) {
-		#display_msg('args', args)
 		args <- c(args, recv(con, TRUE))
-		args[1]
 		send(con, TRUE)
 		}
 	}
-	#display_msg('args', args)
 	kwargs <- list()
 	if (kwarg_count > 0) {
 		keys <- c()
@@ -135,7 +126,6 @@ send(con, TRUE)
 cmd_int <- -1
 while (cmd_int != 0) {
 	cmd_int <- recv(con, FALSE, "integer")
-	display_msg('cmd_int', cmd_int)
 	if (cmd_int == 1){
 		send(con, TRUE)
 		import_variable()