resolve go-python#169 (comment) & go-python#169 (comment)

Author: glaukiol1

os/os.module.go

@@ -67,22 +67,20 @@ func getCwd(self py.Object, args py.Tuple) (py.Object, error) {
 func chdir(self py.Object, args py.Tuple) (py.Object, error) {
 	if len(args) == 0 || len(args) > 1 {
 		return nil, py.ExceptionNewf(py.TypeError, "One argument required")
-	} else {
-		if reflect.TypeOf(args[0]).String() == "py.String" {
-			dir, err := py.ReprAsString(args[0])
-			if err != nil {
-				return nil, py.ExceptionNewf(py.TypeError, "Failed to parse string")
-			}
-			dir = strings.ReplaceAll(dir, "'", "")
-			err = os.Chdir(dir)
-			if err != nil {
-				return nil, py.ExceptionNewf(py.OSError, "Couldn't change cwd; "+err.Error())
-			}
-			return py.None, nil
-		} else {
-			return nil, py.ExceptionNewf(py.TypeError, "Expected string argument at position 0")
+	}
+	if reflect.TypeOf(args[0]).String() == "py.String" {
+		dir, err := py.ReprAsString(args[0])
+		if err != nil {
+			return nil, py.ExceptionNewf(py.TypeError, "Failed to parse string")
+		}
+		dir = strings.ReplaceAll(dir, "'", "")
+		err = os.Chdir(dir)
+		if err != nil {
+			return nil, py.ExceptionNewf(py.OSError, "Couldn't change cwd; "+err.Error())
 		}
+		return py.None, nil
 	}
+	return nil, py.ExceptionNewf(py.TypeError, "Expected string argument at position 0")
 }
 
 // get a enviroment variable by key
@@ -94,29 +92,28 @@ func getenv(self py.Object, args py.Tuple) (py.Object, error) {
 
 	if len(args) > 2 {
 		return nil, py.ExceptionNewf(py.KeyError, "1 argument required, \"key\"")
-	} else {
-		if len(args) == 1 {
-			if reflect.TypeOf(args[0]).String() == "py.String" {
-				key = args[0]
-			} else {
-				return nil, py.ExceptionNewf(py.TypeError, "Expected argument of type string")
-			}
-			default_ = py.None
-		} else if len(args) == 2 {
-			if reflect.TypeOf(args[0]).String() == "py.String" && reflect.TypeOf(args[1]).String() == "py.String" {
-				key = args[0]
-				default_ = args[1]
-			} else {
-				return nil, py.ExceptionNewf(py.TypeError, "Expected argument of type string")
-			}
+	}
+	if len(args) == 1 {
+		if reflect.TypeOf(args[0]).String() == "py.String" {
+			key = args[0]
+		} else {
+			return nil, py.ExceptionNewf(py.TypeError, "Expected argument of type string")
 		}
-		var res py.Object // hold the result value
-		res, err = getEnvVariables().M__getitem__(key)
-		if err != nil {
-			return default_, nil
+		default_ = py.None
+	} else if len(args) == 2 {
+		if reflect.TypeOf(args[0]).String() == "py.String" && reflect.TypeOf(args[1]).String() == "py.String" {
+			key = args[0]
+			default_ = args[1]
+		} else {
+			return nil, py.ExceptionNewf(py.TypeError, "Expected argument of type string")
 		}
-		return res, nil
 	}
+	var res py.Object // hold the result value
+	res, err = getEnvVariables().M__getitem__(key)
+	if err != nil {
+		return default_, nil
+	}
+	return res, nil
 }
 
 // get the current process' pid
@@ -144,12 +141,9 @@ func putenv(self py.Object, args py.Tuple) (py.Object, error) {
 				return nil, py.ExceptionNewf(py.OSError, "Unable to set enviroment variable")
 			}
 			return py.None, nil
-		} else {
-			return nil, py.ExceptionNewf(py.TypeError, "Expected 2 arguments of type string")
 		}
-	} else {
-		return nil, py.ExceptionNewf(py.TypeError, "Expected 2 arguments of type string")
 	}
+	return nil, py.ExceptionNewf(py.TypeError, "Expected 2 arguments of type string")
 }
 
 // Unset (delete) the environment variable named key.
@@ -166,19 +160,15 @@ func unsetenv(self py.Object, args py.Tuple) (py.Object, error) {
 				return nil, py.ExceptionNewf(py.OSError, "Unable to unset enviroment variable")
 			}
 			return py.None, nil
-		} else {
-			return nil, py.ExceptionNewf(py.TypeError, "Expected 1 argument of type string")
 		}
-	} else {
-		return nil, py.ExceptionNewf(py.TypeError, "Expected 1 argument of type string")
 	}
+	return nil, py.ExceptionNewf(py.TypeError, "Expected 1 argument of type string")
 }
 
 // os._exit() immediate program termination; unline sys.exit(), which raises a SystemExit, this function will termninate the program immediately.
 func _exit(self py.Object, args py.Tuple) (py.Object, error) { // can never return
 	if len(args) == 0 {
 		os.Exit(0)
-		return nil, nil
 	} else if len(args) == 1 {
 		_ec, err := py.GetInt(args[0])
 		if err != nil {
@@ -189,36 +179,33 @@ func _exit(self py.Object, args py.Tuple) (py.Object, error) { // can never retu
 			os.Exit(1)
 		}
 		os.Exit(exit_code)
-		return nil, nil
-	} else {
-		os.Exit(1)
-		return nil, nil
 	}
+	os.Exit(1)
+	return nil, nil
 }
 
 // os.system(command string) this function runs a shell command and directs the output to standard output.
 func system(self py.Object, args py.Tuple) (py.Object, error) {
 	if len(args) == 0 {
 		return nil, py.ExceptionNewf(py.TypeError, "Expected 1 or more arguments all of type string")
-	} else {
-		var cargs []string
-		if reflect.TypeOf(args[0]).String() == "py.String" {
-			_carg, err := py.ReprAsString(args[0])
-			if err != nil {
-				return nil, py.ExceptionNewf(py.TypeError, "Unable to parse string") // this will never execute
-			}
-			carg := strings.ReplaceAll(_carg, "'", "") // required
-
-			cargs = strings.Split(carg, " ")
-		} else {
-			return nil, py.ExceptionNewf(py.TypeError, "Expected 1 or more arguments all of type string")
-		}
-		command := exec.Command(cargs[0])
-		outb, err := command.Output()
+	}
+	var cargs []string
+	if reflect.TypeOf(args[0]).String() == "py.String" {
+		_carg, err := py.ReprAsString(args[0])
 		if err != nil {
-			return nil, py.ExceptionNewf(py.OSError, err.Error())
+			return nil, py.ExceptionNewf(py.TypeError, "Unable to parse string") // this will never execute
 		}
-		fmt.Println(string(outb))
-		return py.Int(0), nil
+		carg := strings.ReplaceAll(_carg, "'", "") // required
+
+		cargs = strings.Split(carg, " ")
+	} else {
+		return nil, py.ExceptionNewf(py.TypeError, "Expected 1 or more arguments all of type string")
+	}
+	command := exec.Command(cargs[0])
+	outb, err := command.Output()
+	if err != nil {
+		return nil, py.ExceptionNewf(py.OSError, err.Error())
 	}
+	fmt.Println(string(outb))
+	return py.Int(0), nil
 }