diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1adebcbc..8b6f2a2f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: CI
on:
push:
- branches: [ master ]
+ branches: [ main ]
pull_request:
- branches: [ master ]
+ branches: [ main ]
schedule:
- cron: '0 2 * * 1-5'
diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
index 567247e4..76c93fd3 100644
--- a/CONTRIBUTE.md
+++ b/CONTRIBUTE.md
@@ -40,9 +40,9 @@ If it is large, such as suggesting a new repository, sub-repository, or interfac
### Your First Code Contribution
If you are a new contributor, *thank you!*
-Before your first merge, you will need to be added to the [CONTRIBUTORS](https://github.com/go-python/license/blob/master/CONTRIBUTORS) and [AUTHORS](https://github.com/go-python/license/blob/master/AUTHORS) files.
+Before your first merge, you will need to be added to the [CONTRIBUTORS](https://github.com/go-python/license/blob/main/CONTRIBUTORS) and [AUTHORS](https://github.com/go-python/license/blob/main/AUTHORS) files.
Open a pull request adding yourself to these files.
-All `go-python` code follows the BSD license in the [license document](https://github.com/go-python/license/blob/master/LICENSE).
+All `go-python` code follows the BSD license in the [license document](https://github.com/go-python/license/blob/main/LICENSE).
We prefer that code contributions do not come with additional licensing.
For exceptions, added code must also follow a BSD license.
@@ -88,7 +88,7 @@ Please always format your code with [goimports](https://godoc.org/golang.org/x/t
Best is to have it invoked as a hook when you save your `.go` files.
Files in the `go-python` repository don't list author names, both to avoid clutter and to avoid having to keep the lists up to date.
-Instead, your name will appear in the change log and in the [CONTRIBUTORS](https://github.com/go-python/license/blob/master/CONTRIBUTORS) and [AUTHORS](https://github.com/go-python/license/blob/master/AUTHORS) files.
+Instead, your name will appear in the change log and in the [CONTRIBUTORS](https://github.com/go-python/license/blob/main/CONTRIBUTORS) and [AUTHORS](https://github.com/go-python/license/blob/main/AUTHORS) files.
New files that you contribute should use the standard copyright header:
diff --git a/README.md b/README.md
index 802619bc..883ae510 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
# gpython
[](https://github.com/go-python/gpython/actions)
-[](https://codecov.io/gh/go-python/gpython)
+[](https://codecov.io/gh/go-python/gpython)
[](https://godoc.org/github.com/go-python/gpython)
-[](https://github.com/go-python/gpython/blob/master/LICENSE)
+[](https://github.com/go-python/gpython/blob/main/LICENSE)
gpython is a part re-implementation, part port of the Python 3.4
interpreter in Go. Although there are many areas of improvement,
@@ -54,7 +54,7 @@ gpython currently:
- Supports concurrent multi-interpreter ("multi-context") execution
Speed hasn't been a goal of the conversions however it runs pystone at
-about 20% of the speed of CPython. A [π computation test](https://github.com/go-python/gpython/tree/master/examples/pi_chudnovsky_bs.py) runs quicker under
+about 20% of the speed of CPython. A [π computation test](https://github.com/go-python/gpython/tree/main/examples/pi_chudnovsky_bs.py) runs quicker under
gpython as the Go long integer primitives are likely faster than the
Python ones.
@@ -63,15 +63,15 @@ you know would be interested to take it futher, it would be much appreciated.
## Getting Started
-The [embedding example](https://github.com/go-python/gpython/tree/master/examples/embedding) demonstrates how to
+The [embedding example](https://github.com/go-python/gpython/tree/main/examples/embedding) demonstrates how to
easily embed and invoke gpython from any Go application.
Of interest, gpython is able to run multiple interpreter instances simultaneously,
allowing you to embed gpython naturally into your Go application. This makes it
possible to use gpython in a server situation where complete interpreter
-independence is paramount. See this in action in the [multi-context example](https://github.com/go-python/gpython/tree/master/examples/multi-context).
+independence is paramount. See this in action in the [multi-context example](https://github.com/go-python/gpython/tree/main/examples/multi-context).
-If you are looking to get involved, a light and easy place to start is adding more convenience functions to [py/util.go](https://github.com/go-python/gpython/tree/master/py/util.go). See [notes.txt](https://github.com/go-python/gpython/blob/master/notes.txt) for bigger ideas.
+If you are looking to get involved, a light and easy place to start is adding more convenience functions to [py/util.go](https://github.com/go-python/gpython/tree/main/py/util.go). See [notes.txt](https://github.com/go-python/gpython/blob/main/notes.txt) for bigger ideas.
## Other Projects of Interest
@@ -88,4 +88,4 @@ or on the [Gophers Slack](https://gophers.slack.com/) in the `#go-python` channe
This is licensed under the MIT licence, however it contains code which
was ported fairly directly directly from the CPython source code under
-the [PSF LICENSE](https://github.com/python/cpython/blob/master/LICENSE).
+the [PSF LICENSE](https://github.com/python/cpython/blob/main/LICENSE).
diff --git a/examples/embedding/README.md b/examples/embedding/README.md
index 9c13d748..93a300aa 100644
--- a/examples/embedding/README.md
+++ b/examples/embedding/README.md
@@ -98,5 +98,5 @@ Spring Break itinerary:
- `main.go` demonstrates high-level convenience functions such as `py.RunFile()`.
- Embedding a Go `struct` as a Python object only requires that it implement `py.Object`, which is a single function:
`Type() *py.Type`
- - See [py/run.go](https://github.com/go-python/gpython/tree/master/py/run.go) for more about interpreter instances and `py.Context`
- - Helper functions are available in [py/util.go](https://github.com/go-python/gpython/tree/master/py/util.go) and your contributions are welcome!
+ - See [py/run.go](https://github.com/go-python/gpython/tree/main/py/run.go) for more about interpreter instances and `py.Context`
+ - Helper functions are available in [py/util.go](https://github.com/go-python/gpython/tree/main/py/util.go) and your contributions are welcome!
diff --git a/py/bytes.go b/py/bytes.go
index 7adf050e..55a69681 100644
--- a/py/bytes.go
+++ b/py/bytes.go
@@ -258,9 +258,43 @@ func (a Bytes) M__iadd__(other Object) (Object, error) {
return NotImplemented, nil
}
+func (a Bytes) Replace(args Tuple) (Object, error) {
+ var (
+ pyold Object = None
+ pynew Object = None
+ pycnt Object = Int(-1)
+ )
+ err := ParseTuple(args, "yy|i:replace", &pyold, &pynew, &pycnt)
+ if err != nil {
+ return nil, err
+ }
+
+ var (
+ old = []byte(pyold.(Bytes))
+ new = []byte(pynew.(Bytes))
+ cnt = int(pycnt.(Int))
+ )
+
+ return Bytes(bytes.Replace([]byte(a), old, new, cnt)), nil
+}
+
// Check interface is satisfied
var (
_ richComparison = (Bytes)(nil)
_ I__add__ = (Bytes)(nil)
_ I__iadd__ = (Bytes)(nil)
)
+
+func init() {
+ BytesType.Dict["replace"] = MustNewMethod("replace", func(self Object, args Tuple) (Object, error) {
+ return self.(Bytes).Replace(args)
+ }, 0, `replace(self, old, new, count=-1) -> return a copy with all occurrences of substring old replaced by new.
+
+ count
+ Maximum number of occurrences to replace.
+ -1 (the default value) means replace all occurrences.
+
+If the optional argument count is given, only the first count occurrences are
+replaced.`)
+
+}
diff --git a/py/string.go b/py/string.go
index 58ab7ad0..33507970 100644
--- a/py/string.go
+++ b/py/string.go
@@ -122,6 +122,17 @@ func fieldsN(s string, n int) []string {
}
func init() {
+ StringType.Dict["replace"] = MustNewMethod("replace", func(self Object, args Tuple) (Object, error) {
+ return self.(String).Replace(args)
+ }, 0, `replace(self, old, new, count=-1) -> return a copy with all occurrences of substring old replaced by new.
+
+ count
+ Maximum number of occurrences to replace.
+ -1 (the default value) means replace all occurrences.
+
+If the optional argument count is given, only the first count occurrences are
+replaced.`)
+
StringType.Dict["split"] = MustNewMethod("split", func(self Object, args Tuple, kwargs StringDict) (Object, error) {
return self.(String).Split(args, kwargs)
}, 0, "split(sub) -> split string with sub.")
@@ -598,6 +609,26 @@ func (s String) Split(args Tuple, kwargs StringDict) (Object, error) {
return &o, nil
}
+func (s String) Replace(args Tuple) (Object, error) {
+ var (
+ pyold Object = None
+ pynew Object = None
+ pycnt Object = Int(-1)
+ )
+ err := ParseTuple(args, "ss|i:replace", &pyold, &pynew, &pycnt)
+ if err != nil {
+ return nil, err
+ }
+
+ var (
+ old = string(pyold.(String))
+ new = string(pynew.(String))
+ cnt = int(pycnt.(Int))
+ )
+
+ return String(strings.Replace(string(s), old, new, cnt)), nil
+}
+
// Check stringerface is satisfied
var (
_ richComparison = String("")
diff --git a/stdlib/glob/glob.go b/stdlib/glob/glob.go
new file mode 100644
index 00000000..173a2493
--- /dev/null
+++ b/stdlib/glob/glob.go
@@ -0,0 +1,64 @@
+// Copyright 2022 The go-python Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package glob provides the implementation of the python's 'glob' module.
+package glob
+
+import (
+ "path/filepath"
+
+ "github.com/go-python/gpython/py"
+)
+
+func init() {
+ py.RegisterModule(&py.ModuleImpl{
+ Info: py.ModuleInfo{
+ Name: "glob",
+ Doc: "Filename globbing utility.",
+ },
+ Methods: []*py.Method{
+ py.MustNewMethod("glob", glob, 0, glob_doc),
+ },
+ })
+}
+
+const glob_doc = `Return a list of paths matching a pathname pattern.
+The pattern may contain simple shell-style wildcards a la
+fnmatch. However, unlike fnmatch, filenames starting with a
+dot are special cases that are not matched by '*' and '?'
+patterns.`
+
+func glob(self py.Object, args py.Tuple) (py.Object, error) {
+ var (
+ pypathname py.Object
+ )
+ err := py.ParseTuple(args, "s*:glob", &pypathname)
+ if err != nil {
+ return nil, err
+ }
+
+ var (
+ pathname string
+ cnv func(v string) py.Object
+ )
+ switch n := pypathname.(type) {
+ case py.String:
+ pathname = string(n)
+ cnv = func(v string) py.Object { return py.String(v) }
+ case py.Bytes:
+ pathname = string(n)
+ cnv = func(v string) py.Object { return py.Bytes(v) }
+ }
+ matches, err := filepath.Glob(pathname)
+ if err != nil {
+ return nil, err
+ }
+
+ lst := py.List{Items: make([]py.Object, len(matches))}
+ for i, v := range matches {
+ lst.Items[i] = cnv(v)
+ }
+
+ return &lst, nil
+}
diff --git a/stdlib/glob/glob_test.go b/stdlib/glob/glob_test.go
new file mode 100644
index 00000000..c90cb091
--- /dev/null
+++ b/stdlib/glob/glob_test.go
@@ -0,0 +1,15 @@
+// Copyright 2022 The go-python Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package glob_test
+
+import (
+ "testing"
+
+ "github.com/go-python/gpython/pytest"
+)
+
+func TestGlob(t *testing.T) {
+ pytest.RunScript(t, "./testdata/test.py")
+}
diff --git a/stdlib/glob/testdata/test.py b/stdlib/glob/testdata/test.py
new file mode 100644
index 00000000..042b6b3b
--- /dev/null
+++ b/stdlib/glob/testdata/test.py
@@ -0,0 +1,58 @@
+# Copyright 2022 The go-python Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+import glob
+
+def norm(vs):
+ if len(vs) == 0:
+ return vs
+ if type(vs[0]) == type(""):
+ return normStr(vs)
+ return normBytes(vs)
+
+def normStr(vs):
+ from os import sep
+ x = []
+ for v in vs:
+ x.append(v.replace('/', sep))
+ return x
+
+def normBytes(vs):
+ from os import sep
+ x = []
+ for v in vs:
+ x.append(v.replace(b'/', bytes(sep, encoding="utf-8")))
+ return x
+
+def assertEqual(x, y):
+ xx = norm(x)
+ yy = norm(y)
+ assert xx == yy, "got: %s, want: %s" % (repr(x), repr(y))
+
+
+## test strings
+assertEqual(glob.glob('*'), ["glob.go", "glob_test.go", "testdata"])
+assertEqual(glob.glob('*test*'), ["glob_test.go", "testdata"])
+assertEqual(glob.glob('*/test*'), ["testdata/test.py", "testdata/test_golden.txt"])
+assertEqual(glob.glob('*/test*_*'), ["testdata/test_golden.txt"])
+assertEqual(glob.glob('*/t??t*_*'), ["testdata/test_golden.txt"])
+assertEqual(glob.glob('*/t[e]?t*_*'), ["testdata/test_golden.txt"])
+assertEqual(glob.glob('*/t[oe]?t*_*'), ["testdata/test_golden.txt"])
+assertEqual(glob.glob('*/t[o]?t*_*'), [])
+
+## FIXME(sbinet)
+## assertEqual(glob.glob('*/t[!o]?t*_*'), ["testdata/test_golden.txt"])
+
+## test bytes
+assertEqual(glob.glob(b'*'), [b"glob.go", b"glob_test.go", b"testdata"])
+assertEqual(glob.glob(b'*test*'), [b"glob_test.go", b"testdata"])
+assertEqual(glob.glob(b'*/test*'), [b"testdata/test.py", b"testdata/test_golden.txt"])
+assertEqual(glob.glob(b'*/test*_*'), [b"testdata/test_golden.txt"])
+assertEqual(glob.glob(b'*/t??t*_*'), [b"testdata/test_golden.txt"])
+assertEqual(glob.glob(b'*/t[e]?t*_*'), [b"testdata/test_golden.txt"])
+assertEqual(glob.glob(b'*/t[oe]?t*_*'), [b"testdata/test_golden.txt"])
+assertEqual(glob.glob(b'*/t[o]?t*_*'), [])
+
+## FIXME(sbinet)
+## assertEqual(glob.glob(b'*/t[!o]?t*_*'), [b"testdata/test_golden.txt"])
diff --git a/stdlib/glob/testdata/test_golden.txt b/stdlib/glob/testdata/test_golden.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/stdlib/stdlib.go b/stdlib/stdlib.go
index d69268d3..c78c2209 100644
--- a/stdlib/stdlib.go
+++ b/stdlib/stdlib.go
@@ -20,6 +20,7 @@ import (
_ "github.com/go-python/gpython/stdlib/binascii"
_ "github.com/go-python/gpython/stdlib/builtin"
+ _ "github.com/go-python/gpython/stdlib/glob"
_ "github.com/go-python/gpython/stdlib/math"
_ "github.com/go-python/gpython/stdlib/os"
_ "github.com/go-python/gpython/stdlib/string"
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy