--- /var/abs/extra/python/PKGBUILD	2011-04-11 23:07:14.000000000 -0500
+++ PKGBUILD	2011-04-12 17:31:02.331940417 -0500
@@ -5,7 +5,7 @@
 
 pkgname=python
 pkgver=3.2
-pkgrel=1
+pkgrel=2
 _pybasever=3.2
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64')
@@ -17,12 +17,23 @@
 provides=('python3')
 replaces=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${_pybasever}/Python-${pkgver}.tar.xz)
-sha1sums=('55a3a9d39f31563370d0c494373bb6d38e4d1a00')
+source=(http://www.python.org/ftp/python/${_pybasever}/Python-${pkgver}.tar.xz
+        '6e9dc970ac0e.diff'
+        '7b8d625eb6e4.diff')
+sha1sums=('55a3a9d39f31563370d0c494373bb6d38e4d1a00'
+          '7f0d24eebd9b7a6ea832200d3a4cb17ae49b74d6'
+          'ac6a83916b4f39412fd403efa35cbfd3069ea2de')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
 
+  # picked from http://hg.python.org/cpython/rev/6e9dc970ac0e/ fixes Issue #10785: Store the filename as Unicode in the Python parser
+  # edited to remove the NEWS hunk that failed
+  patch -Np1 -i ${srcdir}/6e9dc970ac0e.diff
+  # picked from http://hg.python.org/cpython/rev/7b8d625eb6e4/ fixes Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error
+  # edited to remove the NEWS hunk that failed
+  patch -Np1 -i ${srcdir}/7b8d625eb6e4.diff
+
   # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat