all: apply staticcheck fixes

Signed-off-by: Sebastien Binet <binet@cern.ch>

Author: sbinet

main.go

@@ -21,10 +21,7 @@ import (
 	_ "github.com/go-python/gpython/stdlib"
 )
 
-// Globals
 var (
-	// Flags
-	debug      = flag.Bool("d", false, "Print lots of debugging")
 	cpuprofile = flag.String("cpuprofile", "", "Write cpu profile to file")
 )
 

parser/lexer_test.go

@@ -7,8 +7,6 @@ package parser
 import (
 	"bytes"
 	"fmt"
-	"log"
-	"math"
 	"testing"
 
 	"github.com/go-python/gpython/ast"
@@ -569,19 +567,6 @@ func TestLexerReadOperator(t *testing.T) {
 	}
 }
 
-// Whether two floats are more or less the same
-func approxEq(a, b float64) bool {
-	log.Printf("ApproxEq(a = %#v, b = %#v)", a, b)
-	diff := a - b
-	log.Printf("ApproxEq(diff = %e)", diff)
-	if math.Abs(diff) > 1e-10 {
-		log.Printf("ApproxEq(false)")
-		return false
-	}
-	log.Printf("ApproxEq(true)")
-	return true
-}
-
 func TestLexerReadNumber(t *testing.T) {
 	x := yyLex{}
 	for _, test := range []struct {
@@ -710,10 +695,10 @@ func TestLexerReadString(t *testing.T) {
 			if testValueBytes, ok := test.value.(py.Bytes); !ok {
 				t.Error("Expecting py.Bytes")
 			} else {
-				equal = (bytes.Compare(valueBytes, testValueBytes) == 0)
+				equal = bytes.Equal(valueBytes, testValueBytes)
 			}
 		} else {
-			equal = (value == test.value)
+			equal = value == test.value
 		}
 
 		if token != test.token || !equal || x.line != test.out {

py/complex.go

@@ -152,13 +152,6 @@ func complexFloor(a Complex) Complex {
 	return Complex(complex(math.Floor(real(a)), math.Floor(imag(a))))
 }
 
-// Floor divide two complex numbers
-func complexFloorDiv(a, b Complex) Complex {
-	q := complexFloor(a / b)
-	r := a - q*b
-	return Complex(r)
-}
-
 func (a Complex) M__floordiv__(other Object) (Object, error) {
 	if b, ok := convertToComplex(other); ok {
 		return complexFloor(a / b), nil

py/import.go

@@ -272,7 +272,7 @@ func XImportModuleLevelObject(ctx Context, nameObj, given_globals, locals, given
 			if err != nil {
 				return nil, err
 			}
-		} else {
+			//	} else { // not initializing
 			// FIXME locking
 			// if _PyImport_ReleaseLock() < 0 {
 			// 	return nil, ExceptionNewf(RuntimeError, "not holding the import lock")

py/type.go

@@ -570,14 +570,14 @@ func lookup_maybe(self Object, attr string) Object {
 	return res
 }
 
-func lookup_method(self Object, attr string) Object {
-	res := lookup_maybe(self, attr)
-	if res == nil {
-		// FIXME PyErr_SetObject(PyExc_AttributeError, attrid->object);
-		return ExceptionNewf(AttributeError, "'%s' object has no attribute '%s'", self.Type().Name, attr)
-	}
-	return res
-}
+// func lookup_method(self Object, attr string) Object {
+// 	res := lookup_maybe(self, attr)
+// 	if res == nil {
+// 		// FIXME PyErr_SetObject(PyExc_AttributeError, attrid->object);
+// 		return ExceptionNewf(AttributeError, "'%s' object has no attribute '%s'", self.Type().Name, attr)
+// 	}
+// 	return res
+// }
 
 // Method resolution order algorithm C3 described in
 // "A Monotonic Superclass Linearization for Dylan",
@@ -955,26 +955,26 @@ func add_subclass(base, t *Type) {
 	// return result;
 }
 
-func remove_subclass(base, t *Type) {
-	// Py_ssize_t i;
-	// PyObject *list, *ref;
-
-	// list = base->tp_subclasses;
-	// if (list == nil) {
-	//     return;
-	// }
-	// assert(PyList_Check(list));
-	// i = PyList_GET_SIZE(list);
-	// while (--i >= 0) {
-	//     ref = PyList_GET_ITEM(list, i);
-	//     assert(PyWeakref_CheckRef(ref));
-	//     if (PyWeakref_GET_OBJECT(ref) == (PyObject*)type) {
-	//         /* this can't fail, right? */
-	//         PySequence_DelItem(list, i);
-	//         return;
-	//     }
-	// }
-}
+// func remove_subclass(base, t *Type) {
+// 	// Py_ssize_t i;
+// 	// PyObject *list, *ref;
+//
+// 	// list = base->tp_subclasses;
+// 	// if (list == nil) {
+// 	//     return;
+// 	// }
+// 	// assert(PyList_Check(list));
+// 	// i = PyList_GET_SIZE(list);
+// 	// while (--i >= 0) {
+// 	//     ref = PyList_GET_ITEM(list, i);
+// 	//     assert(PyWeakref_CheckRef(ref));
+// 	//     if (PyWeakref_GET_OBJECT(ref) == (PyObject*)type) {
+// 	//         /* this can't fail, right? */
+// 	//         PySequence_DelItem(list, i);
+// 	//         return;
+// 	//     }
+// 	// }
+// }
 
 // Ready the type for use
 //

py/zip.go

@@ -10,10 +10,10 @@ type Zip struct {
 	size    int
 }
 
-// A python ZipIterator iterator
-type ZipIterator struct {
-	zip Zip
-}
+// // A python ZipIterator iterator
+// type ZipIterator struct {
+// 	zip Zip
+// }
 
 var ZipType = NewTypeX("zip", `zip(iter1 [,iter2 [...]]) --> zip object
 

repl/cli/cli.go

@@ -12,7 +12,6 @@ import (
 	"os/user"
 	"path/filepath"
 
-	"github.com/go-python/gpython/py"
 	"github.com/go-python/gpython/repl"
 	"github.com/peterh/liner"
 )
@@ -36,7 +35,6 @@ type readline struct {
 	*liner.State
 	repl        *repl.REPL
 	historyFile string
-	module      *py.Module
 	prompt      string
 }
 

stdlib/math/math.go

@@ -75,13 +75,6 @@ var (
 	ERANGE = py.ExceptionNewf(py.OverflowError, "math range error")
 )
 
-// panic if ok is false
-func assert(ok bool) {
-	if !ok {
-		panic("assertion failed")
-	}
-}
-
 // isFinite is true if x is not Nan or +/-Inf
 func isFinite(x float64) bool {
 	return !(math.IsInf(x, 0) || math.IsNaN(x))

stdlib/sys/sys.go

@@ -347,10 +347,10 @@ func sys_setrecursionlimit(self py.Object, args py.Tuple) (py.Object, error) {
 	return nil, py.NotImplementedError
 }
 
-const hash_info_doc = `hash_info
-
-A struct sequence providing parameters used for computing
-numeric hashes.  The attributes are read only.`
+// const hash_info_doc = `hash_info
+//
+// A struct sequence providing parameters used for computing
+// numeric hashes.  The attributes are read only.`
 
 //  PyStructSequence_Field hash_info_fields[] = {
 //     {"width", "width of the type used for hashing, in bits"},
@@ -539,9 +539,9 @@ func sys_clear_type_cache(self py.Object, args py.Tuple) (py.Object, error) {
 	return nil, py.NotImplementedError
 }
 
-const flags__doc__ = `sys.flags
-
-Flags provided through command line arguments or environment vars.`
+// const flags__doc__ = `sys.flags
+//
+// Flags provided through command line arguments or environment vars.`
 
 //  PyTypeObject FlagsType;
 
@@ -603,9 +603,9 @@ Flags provided through command line arguments or environment vars.`
 //     return seq;
 // }
 
-const version_info__doc__ = `sys.version_info
-
-Version information as a named tuple.`
+//const version_info__doc__ = `sys.version_info
+//
+//Version information as a named tuple.`
 
 //  PyStructSequence_Field version_info_fields[] = {
 //     {"major", "Major release number"},