*** /var/folders/5q/5qTPn6xq2RaWqk+1Ytw3-U+++TI/-Tmp-/edifffIAJHR	Mon Feb  4 21:59:36 2008
--- /Users/skip/src/python-mode/python-mode.el	Mon Feb  4 21:36:48 2008
***************
*** 423,453 ****
    (let ((kw1 (mapconcat 'identity
  			'("and"      "assert"   "break"   "class"
  			  "continue" "def"      "del"     "elif"
! 			  "else"     "except"   "exec"    "for"
  			  "from"     "global"   "if"      "import"
  			  "in"       "is"       "lambda"  "not"
! 			  "or"       "pass"     "print"   "raise"
  			  "return"   "while"    "with"    "yield"
! 			  )
  			"\\|"))
  	(kw2 (mapconcat 'identity
  			'("else:" "except:" "finally:" "try:")
  			"\\|"))
  	(kw3 (mapconcat 'identity
! 			;; Don't include True, False, None, or
! 			;; Ellipsis in this list, since they are
! 			;; already defined as pseudo keywords.
  			'("__debug__"
  			  "__import__" "__name__" "abs" "apply" "basestring"
  			  "bool" "buffer" "callable" "chr" "classmethod"
  			  "cmp" "coerce" "compile" "complex" "copyright"
  			  "delattr" "dict" "dir" "divmod"
! 			  "enumerate" "eval" "execfile" "exit" "file"
  			  "filter" "float" "getattr" "globals" "hasattr"
  			  "hash" "hex" "id" "input" "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"
  			  "setattr" "slice" "staticmethod" "str" "sum"
  			  "super" "tuple" "type" "unichr" "unicode" "vars"
--- 423,452 ----
    (let ((kw1 (mapconcat 'identity
  			'("and"      "assert"   "break"   "class"
  			  "continue" "def"      "del"     "elif"
! 			  "else"     "except"   "for"     "None"
  			  "from"     "global"   "if"      "import"
  			  "in"       "is"       "lambda"  "not"
! 			  "or"       "pass"     "raise"   "as"
  			  "return"   "while"    "with"    "yield"
! 			  "True"     "False")
  			"\\|"))
  	(kw2 (mapconcat 'identity
  			'("else:" "except:" "finally:" "try:")
  			"\\|"))
  	(kw3 (mapconcat 'identity
! 			;; Don't include Ellipsis in this list, since it is
! 			;; already defined as a pseudo keyword.
  			'("__debug__"
  			  "__import__" "__name__" "abs" "apply" "basestring"
  			  "bool" "buffer" "callable" "chr" "classmethod"
  			  "cmp" "coerce" "compile" "complex" "copyright"
  			  "delattr" "dict" "dir" "divmod"
! 			  "enumerate" "eval" "execfile" "exec" "exit" "file"
  			  "filter" "float" "getattr" "globals" "hasattr"
  			  "hash" "hex" "id" "input" "int" "intern"
  			  "isinstance" "issubclass" "iter" "len" "license"
  			  "list" "locals" "long" "map" "max" "min" "object"
! 			  "oct" "open" "ord" "pow" "print" "property" "range"
  			  "raw_input" "reduce" "reload" "repr" "round"
  			  "setattr" "slice" "staticmethod" "str" "sum"
  			  "super" "tuple" "type" "unichr" "unicode" "vars"
***************
*** 486,501 ****
       (cons (concat "\\<\\(" kw2 "\\)[ \n\t(]") 1)
       ;; Exceptions
       (list (concat "\\<\\(" kw4 "\\)[ \n\t:,(]") 1 'py-builtins-face)
-      ;; `as' but only in "import foo as bar" or "with foo as bar"
-      '("[ \t]*\\(\\<from\\>.*\\)?\\<import\\>.*\\<\\(as\\)\\>" . 2)
-      '("[ \t]*\\<with\\>.*\\<\\(as\\)\\>" . 1)
       ;; classes
       '("\\<class[ \t]+\\([a-zA-Z_]+[a-zA-Z0-9_]*\\)" 1 font-lock-type-face)
       ;; functions
       '("\\<def[ \t]+\\([a-zA-Z_]+[a-zA-Z0-9_]*\\)"
         1 font-lock-function-name-face)
       ;; pseudo-keywords
!      '("\\<\\(self\\|None\\|True\\|False\\|Ellipsis\\)\\>"
         1 py-pseudo-keyword-face)
       ;; XXX, TODO, and FIXME tags
       '("XXX\\|TODO\\|FIXME" 0 py-XXX-tag-face t)
--- 485,497 ----
       (cons (concat "\\<\\(" kw2 "\\)[ \n\t(]") 1)
       ;; Exceptions
       (list (concat "\\<\\(" kw4 "\\)[ \n\t:,(]") 1 'py-builtins-face)
       ;; classes
       '("\\<class[ \t]+\\([a-zA-Z_]+[a-zA-Z0-9_]*\\)" 1 font-lock-type-face)
       ;; functions
       '("\\<def[ \t]+\\([a-zA-Z_]+[a-zA-Z0-9_]*\\)"
         1 font-lock-function-name-face)
       ;; pseudo-keywords
!      '("\\<\\(self\\|Ellipsis\\)\\>"
         1 py-pseudo-keyword-face)
       ;; XXX, TODO, and FIXME tags
       '("XXX\\|TODO\\|FIXME" 0 py-XXX-tag-face t)