Skip to content

Commit 513c82c

Browse files
committed
some renames and organization in getenv()
1 parent e9c9262 commit 513c82c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

os/os.module.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ func chdir(self py.Object, args py.Tuple) (py.Object, error) {
9898
// If no such environment variable exists and a default value was provided, that value is returned.
9999
func getenv(self py.Object, args py.Tuple) (py.Object, error) {
100100
var (
101-
key py.Object
102-
dflt = py.None
103-
err error
101+
key py.Object
102+
dflt py.Object = py.None
103+
err error
104104
)
105105

106106
if len(args) == 1 {
@@ -109,7 +109,7 @@ func getenv(self py.Object, args py.Tuple) (py.Object, error) {
109109
} else {
110110
return nil, py.ExceptionNewf(py.TypeError, "str expected (pos 1), not "+args[0].Type().Name)
111111
}
112-
default_ = py.None
112+
dflt = py.None
113113
} else if len(args) == 2 {
114114
if objectIsString(args[0]) {
115115
key = args[0]
@@ -118,7 +118,7 @@ func getenv(self py.Object, args py.Tuple) (py.Object, error) {
118118
}
119119
if objectIsString(args[1]) {
120120
key = args[0]
121-
default_ = args[1]
121+
dflt = args[1]
122122
} else {
123123
return nil, py.ExceptionNewf(py.TypeError, "str expected (pos 2), not"+args[1].Type().Name)
124124
}
@@ -128,7 +128,7 @@ func getenv(self py.Object, args py.Tuple) (py.Object, error) {
128128
var res py.Object // hold the result value
129129
res, err = getEnvVariables().M__getitem__(key)
130130
if err != nil {
131-
return default_, nil
131+
return dflt, nil
132132
}
133133
return res, nil
134134
}

0 commit comments

Comments
 (0)