Skip to content

Commit

Permalink
dev-python/slimit-0.8.1 fix working with dev-python/ply-3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Jormangeud committed Jul 13, 2016
1 parent 48590e2 commit 9815fee
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 1 deletion.
3 changes: 2 additions & 1 deletion dev-python/slimit/Manifest
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
AUX slimit-0.8.1-ply-3.6.patch 967 SHA256 59f80add402df9a119ef00cc12a6c4b530451c3a7d31301aecdc2dc3f6c95034 SHA512 3c4f4521b58b28522ef079dcd5b6982928cab9eb016b657ce80deeefbb3ec5b441d7c49096c06e7432f12dbc7d2cade105a70759928373ce03e0183b7d646090 WHIRLPOOL b964af019444aaa0656b2150489e9fe245211cf271e4ad6a2f66170b9a828e219268e357c32a92c944f7ecd29931e88930bbb30b6cf7ca19d5d3cc283967dfda
DIST slimit-0.8.1.zip 88217 SHA256 f433dcef899f166b207b67d91d3f7344659cb33b8259818f084167244e17720b SHA512 df6be158e257e4fa0acb6c08b7821aae10b4075d889d3be165c80c1e4d387ab016e87f9ac522ff46a5954a758a08dbb2a50fac0fbb1e4f1e9edc8cfebb1161b0 WHIRLPOOL 030054a95626a6e925ff19a233dd929ca46af2e0dd7a8936378e6fd4a4c9734a0830869e3d7146a5f1edc2ee8dae724684ecdbb603e8d525266331572687c99a
EBUILD slimit-0.8.1.ebuild 575 SHA256 386c0a64dbea83d3b6ce04da47032ad619350364552172f650c3b508d5a6c7eb SHA512 c979d868fcd962af50bf1e474079789a6ce9d2ef40a9f8865be294f571b9d450275a45b6cba21a0dc2a8abb5de42623405f7c85231d57af74db8821f6e632764 WHIRLPOOL 0f3df189362206d6e268159b22a91dab7e48cd00aded4cf469bb866255106701b39ee96961900fea3621b9cd56c4a2ee82874b073bc5126120fea3f5b0089df7
EBUILD slimit-0.8.1.ebuild 621 SHA256 4ece04093b645a75f38722154d67b27f86af185d2ba312e6b9a3fb12d7f08b33 SHA512 c31c336102c0c9134ad5dd91ae75f8f1036d7551790362c8ba40b8777fc01e2fb63f79f55d6488b0d258e041def03b600d7e02897162a273ef733f1c14281639 WHIRLPOOL 383629c3a310bedba5ea31ebbb5411c3c2d8398d50ab41a41e312bf423bf9c1046d1a0bd43271ee16c621af67cfeed7e342c9e48f0080a0f124f6a299016e8e8
30 changes: 30 additions & 0 deletions dev-python/slimit/files/slimit-0.8.1-ply-3.6.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From 9be727bcf6fe5c5f053e09697946b8d69204753b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moses=20Palm=C3=A9r?= <mosespalmer@gmail.com>
Date: Thu, 16 Jul 2015 20:31:09 +0200
Subject: [PATCH] Always set slimit.parser.*tab to strings

These values are expected by ply to be module names, not module
instances. ply 3.6 will crash if actual modules are passed.
---
src/slimit/parser.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/slimit/parser.py b/src/slimit/parser.py
index d892166..8adacf0 100644
--- a/src/slimit/parser.py
+++ b/src/slimit/parser.py
@@ -29,10 +29,10 @@
from slimit import ast
from slimit.lexer import Lexer

-try:
- from slimit import lextab, yacctab
-except ImportError:
- lextab, yacctab = 'lextab', 'yacctab'
+# The default values for the `Parser` constructor, passed on to ply; they must
+# be strings
+lextab = '%s.lextab' % __package__
+yacctab = '%s.yacctab' % __package__


class Parser(object):
2 changes: 2 additions & 0 deletions dev-python/slimit/slimit-0.8.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""

PATCHES=( "${FILESDIR}/${P}-ply-3.6.patch" )

DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

0 comments on commit 9815fee

Please sign in to comment.