Date: Thursday, November 27, 2014 @ 00:26:15 Author: kkeen Revision: 123167
upgpkg: ipython 2.3.1-1 Modified: ipython/trunk/PKGBUILD Deleted: ipython/trunk/pygments-monkeypatch.diff ---------------------------+ PKGBUILD | 15 ++++----------- pygments-monkeypatch.diff | 22 ---------------------- 2 files changed, 4 insertions(+), 33 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-11-26 23:12:31 UTC (rev 123166) +++ PKGBUILD 2014-11-26 23:26:15 UTC (rev 123167) @@ -7,8 +7,8 @@ pkgbase=ipython pkgname=(ipython ipython2) -pkgver=2.3.0 -pkgrel=3 +pkgver=2.3.1 +pkgrel=1 pkgdesc="An enhanced Interactive Python shell." arch=('any') url="http://ipython.org" @@ -24,18 +24,11 @@ "python-jinja: for ipython notebook" "haskell-pandoc: ipython notebook conversion") #source=("http://archive.ipython.org/release/$pkgver/ipython-$pkgver.tar.gz") -source=("https://pypi.python.org/packages/source/i/ipython/$pkgbase-$pkgver.tar.gz" - "pygments-monkeypatch.diff") -md5sums=('222eecd3a8299c0119c56954c79e4d0f' - 'a8e3ed58e2b3f4198534cbecd03a7ade') +source=("https://pypi.python.org/packages/source/i/ipython/$pkgbase-$pkgver.tar.gz") +md5sums=('2b7085525dac11190bfb45bb8ec8dcbf') build() { cd "$srcdir" - pushd ipython-$pkgver - # this is already in trunk and should only apply to 2.3.0 - # https://github.com/ipython/ipython/issues/6877 - patch -p1 -i ../pygments-monkeypatch.diff - popd cp -r ipython-$pkgver ipython2-$pkgver } Deleted: pygments-monkeypatch.diff =================================================================== --- pygments-monkeypatch.diff 2014-11-26 23:12:31 UTC (rev 123166) +++ pygments-monkeypatch.diff 2014-11-26 23:26:15 UTC (rev 123167) @@ -1,22 +0,0 @@ -diff --git a/IPython/qt/console/pygments_highlighter.py b/IPython/qt/console/pygments_highlighter.py -index 4044be7..402938f 100644 ---- a/IPython/qt/console/pygments_highlighter.py -+++ b/IPython/qt/console/pygments_highlighter.py -@@ -24,11 +24,12 @@ def get_tokens_unprocessed(self, text, stack=('root',)): - for rexmatch, action, new_state in statetokens: - m = rexmatch(text, pos) - if m: -- if type(action) is _TokenType: -- yield pos, action, m.group() -- else: -- for item in action(self, m): -- yield item -+ if action is not None: -+ if type(action) is _TokenType: -+ yield pos, action, m.group() -+ else: -+ for item in action(self, m): -+ yield item - pos = m.end() - if new_state is not None: - # state transition