diff options
| author | Stefan Israelsson Tampe <stefan.itampe@gmail.com> | 2018-08-16 18:24:32 +0200 |
|---|---|---|
| committer | Stefan Israelsson Tampe <stefan.itampe@gmail.com> | 2018-08-16 18:24:32 +0200 |
| commit | 849f5d8389aecbe4c7152061b118f5f6b098b8ba (patch) | |
| tree | f4020f3dcc556f817032e73ce195afd8852d5355 /modules/language/python | |
| parent | 208a32c7ee76c07b36802bc70ec1554daf46df7f (diff) | |
textwrap tested
Diffstat (limited to 'modules/language/python')
| -rw-r--r-- | modules/language/python/module/re.scm | 16 | ||||
| -rw-r--r-- | modules/language/python/module/textwrap.py | 1 |
2 files changed, 10 insertions, 7 deletions
diff --git a/modules/language/python/module/re.scm b/modules/language/python/module/re.scm index edd869d..c19ebc4 100644 --- a/modules/language/python/module/re.scm +++ b/modules/language/python/module/re.scm @@ -126,7 +126,7 @@ (if (isinstance re str) (match- (Regexp re) s flags) (begin - (set-flags flags) + (set-flags (logior (ref re 'flags) flags)) (let ((m (parse s (f-seq e-start (ref re '__re) e-end)))) (if m (ReMatch m re (gs) (ge) s) @@ -138,7 +138,7 @@ (if (isinstance re str) (search- (Regexp re) s flags) (begin - (set-flags flags) + (set-flags (logior flags (ref re 'flags))) (let ((m (parse s (e-search (ref re '__re))))) (if m (ReMatch m re (gs) (ge) s) @@ -150,7 +150,7 @@ (if (isinstance re str) (fullmatch- (Regexp re) ss flags) (begin - (set-flags flags) + (set-flags (logior (ref re 'flags) flags)) (let ((m (parse ss (e-fullmatch (ref re '__re))))) (if m (ReMatch m re (gs) (ge) ss) @@ -171,7 +171,7 @@ (if (not (isinstance re Regexp)) (split- (Regexp re) ss #:maxsplit maxsplit #:flags flags) (begin - (set-flags flags) + (set-flags (logior (ref re 'flags) flags)) (set-maxsplit maxsplit) (let ((m (parse ss (ff* (f-seq! e-maxsplit (e-search (ref re '__re)) @@ -204,7 +204,7 @@ (if (isinstance re str) (finditer- (Regexp re) s flags) (let ((e (ref re '__re))) - (set-flags flags) + (set-flags (logior (ref re 'flags) flags)) ((make-generator () (lambda (yield) (parse s @@ -213,9 +213,11 @@ (f-or! (f-seq! e-start (f-and! e) e-end (f-ftr (lambda (c) - (yield (ReMatch c re (gs) (ge) s)) + (yield + (ReMatch c re (gs) (ge) s)) '()))) - (f-seq (f-reg "."))) + (f-seq (f-reg ".")) + f-nl) (Ds (lp))))))))))) (define finditer finditer-) diff --git a/modules/language/python/module/textwrap.py b/modules/language/python/module/textwrap.py index 8c23431..150e3f9 100644 --- a/modules/language/python/module/textwrap.py +++ b/modules/language/python/module/textwrap.py @@ -430,6 +430,7 @@ def dedent(text): margin = None text = _whitespace_only_re.sub('', text) indents = _leading_whitespace_re.findall(text) + for indent in indents: if margin is None: margin = indent |