gentoo resync : 14.07.2018

2 files changed, 0 insertions, 73 deletions

diff --git a/dev-python/ply/files/3.6-lextab-None.patch b/dev-python/ply/files/3.6-lextab-None.patch
deleted file mode 100644
index cab0a466d66f..000000000000
--- a/dev-python/ply/files/3.6-lextab-None.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From dbf122652d38ba03ff9f9fe4aa9bee3693e6775f Mon Sep 17 00:00:00 2001
-From: David Beazley <dave@dabeaz.com>
-Date: Fri, 8 May 2015 10:10:55 -0500
-Subject: [PATCH] Minor fix to account for bad None arguments for
- tabmodule/lextab
-
----
- ply/lex.py  | 4 ++++
- ply/yacc.py | 5 ++++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/ply/lex.py b/ply/lex.py
-index ed1e2ed..772325c 100644
---- a/ply/lex.py
-+++ b/ply/lex.py
-@@ -859,6 +859,10 @@ def validate_module(self, module):
- # -----------------------------------------------------------------------------
- def lex(module=None, object=None, debug=False, optimize=False, lextab='lextab',
-         reflags=0, nowarn=False, outputdir=None, debuglog=None, errorlog=None):
-+
-+    if lextab is None:
-+        lextab = 'lextab'
-+
-     global lexer
- 
-     ldict = None
-diff --git a/ply/yacc.py b/ply/yacc.py
-index e0b4faf..eb02cc2 100644
---- a/ply/yacc.py
-+++ b/ply/yacc.py
-@@ -2709,7 +2709,7 @@ def write_table(self, tabmodule, outputdir='', signature=''):
- _lr_method = %r
- 
- _lr_signature = %r
--    ''' % (filename, __tabversion__, self.lr_method, signature))
-+    ''' % (os.path.basename(filename), __tabversion__, self.lr_method, signature))
- 
-             # Change smaller to 0 to go back to original tables
-             smaller = 1
-@@ -3183,6 +3183,9 @@ def yacc(method='LALR', debug=yaccdebug, module=None, tabmodule=tab_module, star
-          check_recursion=True, optimize=False, write_tables=True, debugfile=debug_file,
-          outputdir=None, debuglog=None, errorlog=None, picklefile=None):
- 
-+    if tabmodule is None:
-+        tabmodule = tab_module
-+
-     # Reference to the parsing method of the last built parser
-     global parse
- 
diff --git a/dev-python/ply/files/3.6-picklefile-IOError.patch b/dev-python/ply/files/3.6-picklefile-IOError.patch
deleted file mode 100644
index 85b39494a6fd..000000000000
--- a/dev-python/ply/files/3.6-picklefile-IOError.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f50768b0b2176998675e728d84ac05f0eef19614 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 17 May 2015 12:14:16 -0400
-Subject: [PATCH] Catch/ignore IOError when opening picklefile for reading in
- yacc.yacc()
-
-Should resolve #66.
----
- ply/yacc.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ply/yacc.py b/ply/yacc.py
-index eb02cc2..2835c90 100644
---- a/ply/yacc.py
-+++ b/ply/yacc.py
-@@ -3265,6 +3265,8 @@ def yacc(method='LALR', debug=yaccdebug, module=None, tabmodule=tab_module, star
-         errorlog.warning(str(e))
-     except ImportError:
-         pass
-+    except IOError:
-+        pass
- 
-     if debuglog is None:
-         if debug: