mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 08:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Update for 'with' statement.

Browse source
This commit is contained in:
Brett Cannon 2006-03-01 20:53:08 +00:00
parent a9f068726f
commit 20e192b6a6
3 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Misc/Vim/python.vim
View file

@ -14,8 +14,9 @@ if exists("python_highlight_all")
let python_highlight_space_errors = 1 let python_highlight_space_errors = 1
endif endif
syn keyword pythonStatement assert break continue del except exec finally syn keyword pythonStatement as assert break continue del except exec finally
syn keyword pythonStatement global lambda pass print raise return try yield syn keyword pythonStatement global lambda pass print raise return try with
syn keyword pythonStatement yield
syn keyword pythonStatement def class nextgroup=pythonFunction skipwhite syn keyword pythonStatement def class nextgroup=pythonFunction skipwhite
@ -82,8 +83,9 @@ if exists("python_highlight_exceptions")
syn keyword pythonException UnicodeTranslateError MemoryError StopIteration syn keyword pythonException UnicodeTranslateError MemoryError StopIteration
syn keyword pythonException PendingDeprecationWarning EnvironmentError syn keyword pythonException PendingDeprecationWarning EnvironmentError
syn keyword pythonException LookupError OSError DeprecationWarning syn keyword pythonException LookupError OSError DeprecationWarning
syn keyword pythonException UnicodeError FloatingPointError ReferenceError syn keyword pythonException UnicodeError UnicodeEncodeError
syn keyword pythonException NameError OverflowWarning IOError SyntaxError syn keyword pythonException FloatingPointError ReferenceError NameError
syn keyword pythonException OverflowWarning IOError SyntaxError
syn keyword pythonException FutureWarning SystemExit Exception EOFError syn keyword pythonException FutureWarning SystemExit Exception EOFError
syn keyword pythonException StandardError ValueError TabError KeyError syn keyword pythonException StandardError ValueError TabError KeyError
syn keyword pythonException ZeroDivisionError SystemError syn keyword pythonException ZeroDivisionError SystemError
@ -92,7 +94,7 @@ if exists("python_highlight_exceptions")
syn keyword pythonException RuntimeWarning KeyboardInterrupt UserWarning syn keyword pythonException RuntimeWarning KeyboardInterrupt UserWarning
syn keyword pythonException SyntaxWarning UnboundLocalError ArithmeticError syn keyword pythonException SyntaxWarning UnboundLocalError ArithmeticError
syn keyword pythonException Warning NotImplementedError AttributeError syn keyword pythonException Warning NotImplementedError AttributeError
syn keyword pythonException OverflowError UnicodeEncodeError syn keyword pythonException OverflowError BaseException
endif endif

14
Misc/Vim/syntax_test.py
View file

@ -13,20 +13,28 @@ repository.
# OPTIONAL: XXX catch your attention # OPTIONAL: XXX catch your attention
# Statements # Statements
from __future__ import with_statement # Import
from sys import path as thing
assert True # keyword assert True # keyword
def foo(): # function definition def foo(): # function definition
return [] return []
class Bar(object): # Class definition class Bar(object): # Class definition
pass def __context__(self):
return self
def __enter__(self):
pass
def __exit__(self, *args):
pass
foo() # UNCOLOURED: function call foo() # UNCOLOURED: function call
while False: # 'while' while False: # 'while'
continue continue
for x in foo(): # 'for' for x in foo(): # 'for'
break break
with Bar() as stuff:
pass
if False: pass # 'if' if False: pass # 'if'
elif False: pass elif False: pass
else False: pass else: pass
from sys import path as thing # Import
# Constants # Constants
'single-quote', u'unicode' # Strings of all kinds; prefixes not highlighted 'single-quote', u'unicode' # Strings of all kinds; prefixes not highlighted

15
Misc/Vim/vim_syntax.py
View file

@ -1,3 +1,5 @@
from __future__ import with_statement
import keyword import keyword
import exceptions import exceptions
import __builtin__ import __builtin__
@ -143,11 +145,9 @@ def fill_stmt(iterable, fill_len):
except StopIteration: except StopIteration:
if buffer_: if buffer_:
break break
if not buffer_ and overflow: if overflow:
yield buffer_ yield overflow
return return
else:
return
if total_len > fill_len: if total_len > fill_len:
overflow = buffer_.pop() overflow = buffer_.pop()
total_len -= len(overflow) - 1 total_len -= len(overflow) - 1
@ -158,8 +158,7 @@ def fill_stmt(iterable, fill_len):
FILL = 80 FILL = 80
def main(file_path): def main(file_path):
FILE = open(file_path, 'w') with open(file_path, 'w') as FILE:
try:
# Comment for file # Comment for file
print>>FILE, comment_header print>>FILE, comment_header
print>>FILE, '' print>>FILE, ''
@ -222,8 +221,6 @@ def main(file_path):
print>>FILE, '' print>>FILE, ''
# Statements at the end of the file # Statements at the end of the file
print>>FILE, statement_footer print>>FILE, statement_footer
finally:
FILE.close()
if __name__ == '__main__': if __name__ == '__main__':
main("python.vim") main("python.vim")