Merge lp:~wgrant/launchpad/pygments-1.4 into lp:launchpad

[William Grant]

[r=gmb][bug=727065] Upgrade to Pygments 1.4, fixing codebrowse hangs.

Upgrade from Pygments 0.8 to 1.4, because antique eggs like to hang codebrowse.

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'lib/lp_sitecustomize.py'
--- lib/lp_sitecustomize.py	2011-02-20 13:26:48 +0000
+++ lib/lp_sitecustomize.py	2011-03-01 10:42:40 +0000
@@ -102,13 +102,6 @@
     warnings.filterwarnings(
         'ignore', '.*apt_pkg.*', category=DeprecationWarning)
 
-    # pygments-0.8 on Python 2.6:
-    #   DeprecationWarning: object.__init__() takes no parameters
-    warnings.filterwarnings(
-        'ignore',
-        category=DeprecationWarning,
-        module='pygments')
-
 
 def customize_logger():
     """Customize the logging system.

=== modified file 'versions.cfg'
--- versions.cfg	2011-02-28 06:28:16 +0000
+++ versions.cfg	2011-03-01 10:42:40 +0000
@@ -55,7 +55,7 @@
 pyasn1 = 0.0.9a
 pycrypto = 2.0.1
 pydkim = 0.3-mbp-r7
-Pygments = 0.8
+Pygments = 1.4
 pyOpenSSL = 0.10
 python-memcached = 1.45
 # 2.2.1 with the one-liner Expect: 100-continue fix from