Get rid of a bunch more raw_input references
diff --git a/Misc/Vim/python.vim b/Misc/Vim/python.vim
index 0d5e6d0..a31fa30 100644
--- a/Misc/Vim/python.vim
+++ b/Misc/Vim/python.vim
@@ -63,16 +63,16 @@
if exists("python_highlight_builtins")
syn keyword pythonBuiltin unichr all set abs vars int __import__ unicode
- syn keyword pythonBuiltin enumerate reduce coerce intern exit issubclass
- syn keyword pythonBuiltin divmod file Ellipsis apply isinstance open any
+ syn keyword pythonBuiltin enumerate reduce exit issubclass
+ syn keyword pythonBuiltin divmod file Ellipsis isinstance open any
syn keyword pythonBuiltin locals help filter basestring slice copyright min
- syn keyword pythonBuiltin super sum tuple hex execfile long id xrange chr
+ syn keyword pythonBuiltin super sum tuple hex execfile long id chr
syn keyword pythonBuiltin complex bool zip pow dict True oct NotImplemented
syn keyword pythonBuiltin map None float hash getattr buffer max reversed
syn keyword pythonBuiltin object quit len repr callable credits setattr
syn keyword pythonBuiltin eval frozenset sorted ord __debug__ hasattr
- syn keyword pythonBuiltin delattr False input license classmethod type
- syn keyword pythonBuiltin raw_input list iter compile reload range globals
+ syn keyword pythonBuiltin delattr False license classmethod type
+ syn keyword pythonBuiltin list iter reload range globals
syn keyword pythonBuiltin staticmethod str property round dir cmp
endif
diff --git a/Misc/cheatsheet b/Misc/cheatsheet
index d50ed2e..b8de4281 100644
--- a/Misc/cheatsheet
+++ b/Misc/cheatsheet
@@ -925,8 +925,6 @@
globals[, locals[, more details)
fromlist]]])
abs(x) Return the absolute value of number x.
-apply(f, args[, Calls func/method f with arguments args and optional
-keywords]) keywords.
bool(x) Returns True when the argument x is true and False otherwise.
buffer(obj) Creates a buffer reference to an object.
callable(x) Returns True if x callable, else False.
@@ -934,10 +932,6 @@
classmethod(f) Converts a function f, into a method with the class as the
first argument. Useful for creating alternative constructors.
cmp(x,y) Returns negative, 0, positive if x <, ==, > to y
-coerce(x,y) Returns a tuple of the two numeric arguments converted to a
- common type.
- Compiles string into a code object.filename is used in
- error message, can be any string. It isusually the file
compile(string, from which the code was read, or eg. '<string>'if not read
filename, kind) from file.kind can be 'eval' if string is a single stmt, or
'single' which prints the output of expression statements
@@ -971,8 +965,6 @@
help(f) Display documentation on object f.
hex(x) Converts a number x to a hexadecimal string.
id(object) Returns a unique 'identity' integer for an object.
-input([prompt]) Prints prompt if given. Reads input and evaluates it.
- Converts a number or a string to a plain integer. Optional
int(x[, base]) base paramenter specifies base from which to convert string
values.
intern(aString) Enters aString in the table of "interned strings"
@@ -1013,8 +1005,6 @@
range(start [,end Returns list of ints from >= start and < end.With 1 arg,
[, step]]) list from 0..arg-1With 2 args, list from start..end-1With 3
args, list from start up to end by step
-raw_input([prompt]) Prints prompt if given, then reads string from stdinput (no
- trailing \n). See also input().
reduce(f, list [, Applies the binary function f to the items oflist so as to
init]) reduce the list to a single value.If init given, it is
"prepended" to list.
diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 202541c..1392c84 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -378,18 +378,18 @@
"ZeroDivisionError" "__debug__"
"__import__" "__name__" "abs" "apply" "basestring"
"bool" "buffer" "callable" "chr" "classmethod"
- "cmp" "coerce" "compile" "complex" "copyright"
+ "cmp" "compile" "complex" "copyright"
"delattr" "dict" "dir" "divmod"
"enumerate" "eval" "execfile" "exit" "file"
"filter" "float" "getattr" "globals" "hasattr"
- "hash" "hex" "id" "input" "int" "intern"
+ "hash" "hex" "id" "int" "intern"
"isinstance" "issubclass" "iter" "len" "license"
"list" "locals" "long" "map" "max" "min" "object"
"oct" "open" "ord" "pow" "property" "range"
- "raw_input" "reduce" "reload" "repr" "round"
+ "reduce" "reload" "repr" "round"
"setattr" "slice" "staticmethod" "str" "sum"
"super" "tuple" "type" "unichr" "unicode" "vars"
- "xrange" "zip")
+ "zip")
"\\|"))
)
(list