fixed upstream
-------- Original-Nachricht --------
Betreff: [Branch ~python-mode-devs/python-mode/python-mode] Rev 1021: tqs
single quote, lp:1018994, fixed
Datum: Mon, 02 Jul 2012 05:30:21 -0000
Von: nore...@launchpad.net
Antwort an: nore...@launchpad.net
An: Andreas Roehler <andreas.roeh...@online.de>
------------------------------------------------------------
revno: 1021
fixes bug: https://launchpad.net/bugs/1018994
committer: Andreas Roehler <andreas.roeh...@online.de>
branch nick: python-mode
timestamp: Sun 2012-07-01 22:09:56 +0200
message:
tqs single quote, lp:1018994, fixed
modified:
python-mode.el
test/py-bug-numbered-tests.el
test/python-mode-tests.sh
--
lp:python-mode
https://code.launchpad.net/~python-mode-devs/python-mode/python-mode
Your team python-mode.el developers is subscribed to branch lp:python-mode.
To unsubscribe from this branch go to
https://code.launchpad.net/~python-mode-devs/python-mode/python-mode/+edit-subscription
=== modified file 'python-mode.el'
--- python-mode.el 2012-06-30 20:32:02 +0000
+++ python-mode.el 2012-07-01 20:09:56 +0000
@@ -3149,14 +3149,11 @@
;; string delimiters. Fixme: Is there a better way?
;; First avoid a sequence preceded by an odd number of backslashes.
`((,(concat "\\(?:^\\|[^\\]\\(?:\\\\.\\)*\\)" ;Prefix.
- "\\(?1:\"\\)\\(?2:\"\\)\\(?3:\"\\)\\(?4:\"\\)\\(?5:\"\\)\\(?6:\"\\)\\|\\(?1:\"\\)\\(?2:\"\\)\\(?3:\"\\)\\|\\('\\)\\('\\)\\('\\)\\|\\('\\)\\('\\)\\('\\)\\('\\)\\('\\)\\('\\)")
+ "\\(?1:\"\\)\\(?2:\"\\)\\(?3:\"\\)\\(?4:\"\\)\\(?5:\"\\)\\(?6:\"\\)\\|\\(?1:\"\\)\\(?2:\"\\)\\(?3:\"\\)\\|\\(?1:'\\)\\(?2:'\\)\\(?3:'\\)\\(?4:'\\)\\(?5:'\\)\\(?6:'\\)\\|\\(?1:'\\)\\(?2:'\\)\\(?3:'\\)\\(?4:'\\)\\(?5:'\\)\\(?6:'\\)\\|\\(?1:'\\)\\(?2:'\\)\\(?3:'\\)")
(1 (python-quote-syntax 1) t t)
(2 (python-quote-syntax 2) t t)
(3 (python-quote-syntax 3) t t)
- (6 (python-quote-syntax 1) t t))
- ;; This doesn't really help.
- ;; (,(rx (and ?\\ (group ?\n))) (1 " "))
- ))
+ (6 (python-quote-syntax 1) t t))))
(defun python-quote-syntax (n)
"Put `syntax-table' property correctly on triple quote.
=== modified file 'test/py-bug-numbered-tests.el'
--- test/py-bug-numbered-tests.el 2012-06-30 20:32:02 +0000
+++ test/py-bug-numbered-tests.el 2012-07-01 20:09:56 +0000
@@ -59,7 +59,7 @@
'mark-block-region-lp:328806-test
'mark-decorators-lp:328851-test
'nested-dictionaries-indent-lp:328791-test
- 'triple-quoted-string-dq-lp:302834-test
+ 'tqs-lp:302834-lp:1018994-test
'fore-00007F-breaks-indentation-lp:328788-test
'dq-in-tqs-string-lp:328813-test
'flexible-indentation-lp:328842-test
@@ -504,7 +504,7 @@
(set-buffer-modified-p 'nil)
(kill-buffer (current-buffer))))
-(defun triple-quoted-string-dq-lp:302834-test (&optional arg)
+(defun tqs-lp:302834-lp:1018994-test (&optional arg)
"With ARG greater 1 keep test buffer open.
If no `load-branch-function' is specified, make sure the appropriate branch is loaded. Otherwise default python-mode will be checked."
(interactive "p")
@@ -529,9 +529,9 @@
(insert "\"")
(font-lock-fontify-buffer)
(sit-for 0.2)
- (assert (eq erg (get-char-property (point) 'face)) "triple-quoted-string-dq-lp:302834-test #1 failed.")
+ (assert (eq erg (get-char-property (point) 'face)) "tqs-lp:302834-lp:1018994-test #1 failed.")
(goto-char 153)
- (assert (eq erg (get-char-property (point) 'face)) "triple-quoted-string-dq-lp:302834-test #2 failed.")
+ (assert (eq erg (get-char-property (point) 'face)) "tqs-lp:302834-lp:1018994-test #2 failed.")
)))
(defun inbound-indentation-multiline-assignment-lp:629916-test (&optional arg)
@@ -2850,7 +2850,7 @@
\"\"\"\"\"\"
''''''
"))
- (py-bug-tests-intern 'empty-triple-quote-lp:1009318-base arg teststring)))
+ (py-bug-tests-intern 'empty-triple-quote-lp:1009318-base arg teststring)))
(defun empty-triple-quote-lp:1009318-base ()
(goto-char 54)
@@ -2865,7 +2865,7 @@
import re
re.s
"))
- (py-bug-tests-intern 'completion-at-gentoo-lp-1008842-base arg teststring)))
+ (py-bug-tests-intern 'completion-at-gentoo-lp-1008842-base arg teststring)))
(defun completion-at-gentoo-lp-1008842-base ()
(goto-char 62)
@@ -2879,7 +2879,7 @@
setup(
name = \"fail2ban\",
"))
- (py-bug-tests-intern 'converts-tabs-to-spaces-in-indent-tabs-mode-t-lp-1019128.py-base arg teststring)))
+ (py-bug-tests-intern 'converts-tabs-to-spaces-in-indent-tabs-mode-t-lp-1019128.py-base arg teststring)))
(defun converts-tabs-to-spaces-in-indent-tabs-mode-t-lp-1019128.py-base ()
(let ((indent-tabs-mode t))
@@ -2898,11 +2898,11 @@
baz()
return 1
"))
- (py-bug-tests-intern 'return-statement-indented-incorrectly-lp-1019601.py-base arg teststring)))
+ (py-bug-tests-intern 'return-statement-indented-incorrectly-lp-1019601.py-base arg teststring)))
(defun return-statement-indented-incorrectly-lp-1019601.py-base ()
- (goto-char 99)
- (assert (eq 4 (py-compute-indentation)) nil "return-statement-indented-incorrectly-lp-1019601.py-test failed"))
+ (goto-char 99)
+ (assert (eq 4 (py-compute-indentation)) nil "return-statement-indented-incorrectly-lp-1019601.py-test failed"))
(provide 'py-bug-numbered-tests)
;;; py-bug-numbered-tests.el ends here
=== modified file 'test/python-mode-tests.sh'
--- test/python-mode-tests.sh 2012-06-30 20:32:02 +0000
+++ test/python-mode-tests.sh 2012-07-01 20:09:56 +0000
@@ -672,6 +672,7 @@
-eval "(assert (commandp 'py-mark-block-misbehave-lp:949310-test) nil \"py-mark-block-misbehave-lp:949310-test not detected as command\")" \
-eval "(assert (commandp 'py-mark-partial-expression) nil \"py-mark-partial-expression not detected as command\")" \
-eval "(message \"commandp tests done\")" \
+--funcall tqs-lp:302834-lp:1018994-test \
--funcall return-statement-indented-incorrectly-lp-1019601.py-test \
--funcall converts-tabs-to-spaces-in-indent-tabs-mode-t-lp-1019128.py-test \
--funcall empty-triple-quote-lp:1009318-test \
@@ -940,7 +941,7 @@
--funcall py-menu-pyshell-test \
--funcall completion-fails-in-python-script-r989-lp:1004613-test \
--funcall py-completion-at-point-test \
---funcall triple-quoted-string-dq-lp:302834-test \
+
else
