From 7d9286b3538a2a57a1ee8eb5b00e156f1ff898ba Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Fri, 19 Apr 2019 05:40:26 -0400
Subject: [PATCH] Get ready for release 3.3.1

---
 NEWS.md                       | 16 +++++++++++++++-
 uncompyle6/parsers/parse3.py  |  2 +-
 uncompyle6/parsers/parse34.py |  5 -----
 uncompyle6/version.py         |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 123dbf1d..05fccc36 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,18 @@
-3.3.0 2019-03-23 Holy Week
+3.3.1 2019-04-19 Good Friday
+==========================
+
+Lots of decomplation bugs, especially in the 3.x series fixed. Don't worry though, many more remain.
+
+* Add annotation return values in 3.6+
+* Fix 3.6+ lambda parameter handling decompilation
+* Fix 3.7+ chained comparision decompilation
+* split out semantic-action customization into more separate files
+* Add 3.8 try/else
+* Fix 2.7 generator decompilation
+* Fix some parser failures fixes in 3.4+ using test_pyenvlib
+* Add more run tests
+
+3.3.0 2019-43-14 Holy Week
 ==========================
 
 * First cut at Python 3.8 (many bugs remain)
diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
index c8eb80df..ae516e2a 100644
--- a/uncompyle6/parsers/parse3.py
+++ b/uncompyle6/parsers/parse3.py
@@ -98,7 +98,7 @@ class Python3Parser(PythonParser):
         sstmt ::= return RETURN_LAST
 
         return_if_stmts ::= return_if_stmt come_from_opt
-        return_if_stmts ::= _stmts return_if_stmt
+        return_if_stmts ::= _stmts return_if_stmt _come_froms
         return_if_stmt  ::= ret_expr RETURN_END_IF
         returns         ::= _stmts return_if_stmt
 
diff --git a/uncompyle6/parsers/parse34.py b/uncompyle6/parsers/parse34.py
index 4b5eaaa4..5cde0c3d 100644
--- a/uncompyle6/parsers/parse34.py
+++ b/uncompyle6/parsers/parse34.py
@@ -17,15 +17,10 @@ spark grammar differences over Python 3.3 for Python 3.4
 """
 
 from uncompyle6.parser import PythonParserSingle
-from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
 from uncompyle6.parsers.parse33 import Python33Parser
 
 class Python34Parser(Python33Parser):
 
-    def __init__(self, debug_parser=PARSER_DEFAULT_DEBUG):
-        super(Python34Parser, self).__init__(debug_parser)
-        self.customized = {}
-
     def p_misc34(self, args):
         """
         expr ::= LOAD_ASSERT
diff --git a/uncompyle6/version.py b/uncompyle6/version.py
index c1423e80..efedabf1 100644
--- a/uncompyle6/version.py
+++ b/uncompyle6/version.py
@@ -12,4 +12,4 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # This file is suitable for sourcing inside bash as
 # well as importing into Python
-VERSION='3.3.0'  # noqa
+VERSION='3.3.1'  # noqa