summaryrefslogtreecommitdiff
path: root/inc/geshi/python.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2009-03-23 10:42:53 +0100
committerAndreas Gohr <andi@splitbrain.org>2009-03-23 10:42:53 +0100
commit2b8d02bf0a560f0ee8fa887fed0d2bbf66b10bae (patch)
treed8fd32b508377b76b9213b0b67835eac9b003345 /inc/geshi/python.php
parentccf354b192cc6f8e554b4729cb1424b93bf82602 (diff)
downloadrpg-2b8d02bf0a560f0ee8fa887fed0d2bbf66b10bae.tar.gz
rpg-2b8d02bf0a560f0ee8fa887fed0d2bbf66b10bae.tar.bz2
GeSHi 1.0.8.3 update
Ignore-this: d204f804a634d5a537737dc4a50c3c13 darcs-hash:20090323094253-7ad00-003ea6c7b9cb1306ad0623274917bbfc042a0103.gz
Diffstat (limited to 'inc/geshi/python.php')
-rw-r--r--inc/geshi/python.php14
1 files changed, 10 insertions, 4 deletions
diff --git a/inc/geshi/python.php b/inc/geshi/python.php
index 31cbe1167..fbc6cab94 100644
--- a/inc/geshi/python.php
+++ b/inc/geshi/python.php
@@ -4,13 +4,15 @@
* ----------
* Author: Roberto Rossi (rsoftware@altervista.org)
* Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.3
* Date Started: 2004/08/30
*
* Python language file for GeSHi.
*
* CHANGES
* -------
+ * 2008/12/18
+ * - Added missing functions and keywords. Also added two new Python 3.0 types. SF#2441839
* 2005/05/26
* - Modifications by Tim (tim@skreak.com): added more keyword categories, tweaked colors
* 2004/11/27 (1.0.1)
@@ -58,7 +60,7 @@ $language_data = array (
1 => array(
'and', 'del', 'for', 'is', 'raise', 'assert', 'elif', 'from', 'lambda', 'return', 'break',
'else', 'global', 'not', 'try', 'class', 'except', 'if', 'or', 'while', 'continue', 'exec',
- 'import', 'pass', 'yield', 'def', 'finally', 'in', 'print'
+ 'import', 'pass', 'yield', 'def', 'finally', 'in', 'print', 'with', 'as'
),
/*
@@ -87,7 +89,9 @@ $language_data = array (
'UserWarning', 'DeprecationWarning', 'PendingDeprecationWarning', 'SyntaxWarning',
'RuntimeWarning', 'FutureWarning',
// self: this is a common python convention (but not a reserved word)
- 'self'
+ 'self',
+ // other
+ 'any', 'all'
),
/*
@@ -124,7 +128,9 @@ $language_data = array (
'tokenize', 'traceback', 'tty', 'turtle', 'types', 'unicodedata', 'unittest', 'urllib2',
'urllib', 'urlparse', 'user', 'UserDict', 'UserList', 'UserString', 'uu', 'warnings',
'wave', 'weakref', 'webbrowser', 'whichdb', 'whrandom', 'winsound', 'xdrlib', 'xml',
- 'xmllib', 'xmlrpclib', 'zipfile', 'zipimport', 'zlib'
+ 'xmllib', 'xmlrpclib', 'zipfile', 'zipimport', 'zlib',
+ // Python 3.0
+ 'bytes', 'bytearray'
),
/*