summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-09-06 06:28:06 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-09-06 06:28:06 (GMT)
commitca460d9722c9542004c4cf34d9231641ac18e34b (patch)
treeb007e31668de7ff4b37e0c8d80dc575e8b600118 /Lib
parent98775dfebc86aca40b27dcca5e4f4fd3a07e8acb (diff)
downloadcpython-ca460d9722c9542004c4cf34d9231641ac18e34b.zip
cpython-ca460d9722c9542004c4cf34d9231641ac18e34b.tar.gz
cpython-ca460d9722c9542004c4cf34d9231641ac18e34b.tar.bz2
with and as are now keywords. There are some generated files I can't recreate.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/plat-mac/aetools.py10
-rw-r--r--Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py2
-rw-r--r--Lib/plat-sunos5/STROPTS.py2
3 files changed, 7 insertions, 7 deletions
diff --git a/Lib/plat-mac/aetools.py b/Lib/plat-mac/aetools.py
index 79f3978..c277b52 100644
--- a/Lib/plat-mac/aetools.py
+++ b/Lib/plat-mac/aetools.py
@@ -233,7 +233,7 @@ class TalkTo:
"""Send 'activate' command"""
self.send('misc', 'actv')
- def _get(self, _object, as=None, _attributes={}):
+ def _get(self, _object, asfile=None, _attributes={}):
"""_get: get data from an object
Required argument: the object
Keyword argument _attributes: AppleEvent attribute dictionary
@@ -243,8 +243,8 @@ class TalkTo:
_subcode = 'getd'
_arguments = {'----':_object}
- if as:
- _arguments['rtyp'] = mktype(as)
+ if asfile:
+ _arguments['rtyp'] = mktype(asfile)
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
@@ -253,8 +253,8 @@ class TalkTo:
if _arguments.has_key('----'):
return _arguments['----']
- if as:
- item.__class__ = as
+ if asfile:
+ item.__class__ = asfile
return item
get = _get
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
index 574043d..773d1d7 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
@@ -300,7 +300,7 @@ class AppleScript_Suite_Events:
if _arguments.has_key('----'):
return _arguments['----']
- def as(self, _object, _attributes={}, **_arguments):
+ def as_(self, _object, _attributes={}, **_arguments):
"""as: Coercion
Required argument: an AE object reference
Keyword argument _attributes: AppleEvent attribute dictionary
diff --git a/Lib/plat-sunos5/STROPTS.py b/Lib/plat-sunos5/STROPTS.py
index e95db93..4970bd7 100644
--- a/Lib/plat-sunos5/STROPTS.py
+++ b/Lib/plat-sunos5/STROPTS.py
@@ -1550,7 +1550,7 @@ IE_NOMEM = -1
AS_PAGLCK = 0x80
AS_CLAIMGAP = 0x40
AS_UNMAPWAIT = 0x20
-def AS_TYPE_64BIT(as): return \
+def AS_TYPE_64BIT(as_): return \
AS_LREP_LINKEDLIST = 0
AS_LREP_SKIPLIST = 1