simply since we don't do 3.0 in this branch

remove parens around decorators by adjusting precidence
Partial handling of quotes within 3.6 format strings

.gitignore

@@ -1,11 +1,15 @@
-*.pyo
 *.pyc
+*.pyo
 *_dis
 *~
 /.cache
 /.eggs
+/.hypothesis
+/.idea
+/.pytest_cache
 /.python-version
 /.tox
+/.venv*
 /README
 /__pkginfo__.pyc
 /dist
@@ -14,9 +18,6 @@
 /tmp
 /uncompyle6.egg-info
 /unpyc
+ChangeLog
 __pycache__
 build
-/.venv*
-/.idea
-/.hypothesis
-ChangeLog

COPYING

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

HISTORY.md

@@ -1,4 +1,4 @@
-This project has history of over 17 years spanning back to Python 1.5
+This project has history of over 18 years spanning back to Python 1.5
 
 There have been a number of people who have worked on this. I am awed
 by the amount of work, number of people who have contributed to this,

HOW-TO-REPORT-A-BUG.md

@@ -57,6 +57,19 @@ disassembler called `pydisasm`.
 
 ### Semantic equivalence vs. exact source code
 
+Consider how Python compiles something like "(x*y) + 5". Early on
+Python creates an "abstract syntax tree" (AST) for this. And this is
+"abstract" in the sense that unimportant, redundant or unnecceary
+items have been removed. Here, this means that any notion that you
+wrote "x+y" in parenthesis is lost, since in this context they are
+unneeded. Also lost is the fact that the multiplication didn't have
+spaces around it while the addition did. It should not come as a
+surprise then that the bytecode which is derived from the AST also has
+no notion of such possible variation. Generally this kind of thing
+isn't noticed since the Python community has laid out a very rigid set
+of formatting guidelines; and it has largely beaten the community into
+compliance.
+
 Almost all versions of Python can perform some sort of code
 improvement that can't be undone. In earlier versions of Python it is
 rare; in later Python versions, it is more common.
@@ -66,7 +79,7 @@ If the code emitted is semantically equivalent, then this isn't a bug.
 
 For example the code might be
 
-```
+```python
 if a:
   if b:
      x = 1
@@ -74,7 +87,7 @@ if a:
 
 and we might produce:
 
-```
+```python
 if a and b:
   x = 1
 ```
@@ -87,24 +100,35 @@ else:
 
 ```
 
-may come out as `elif`.
+may come out as `elif` or vice versa.
 
 
 As mentioned in the README, It is possible that Python changes what
 you write to be more efficient. For example, for:
 
 
-```
+```python
 if True:
   x = 5
 ```
 
 Python will generate code like:
 
-```
+```python
 x = 5
 ```
 
+Even more extreme, if your code is:
+
+```python
+if False:
+   x = 1
+   y = 2
+   # ...
+```
+
+Python will eliminate the entire "if" statement.
+
 So just because the text isn't the same, does not
 necessarily mean there's a bug.
 

LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2015 by Rocky Bernstein
-Copyright (c) 2000 by hartmut Goebel <h.goebel@crazy-compilers.com>
-Copyright (c) 1998-2002 John Aycock
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

MANIFEST.in

@@ -2,7 +2,7 @@ include README.rst
 include ChangeLog
 include HISTORY.md
 include HOW-TO-REPORT-A-BUG.md
-include LICENSE
+include COPYING
 include Makefile
 include requirements.txt
 include requirements-dev.txt

NEWS

@@ -1,3 +1,43 @@
+uncompyle6 3.1.0 2018-03-21 Equinox
+
+- Add code_deparse_with_offset() fragment function.
+- Correct paramenter call fragment deparse_code()
+- Lots of 3.6, 3.x, and 2.7 bug fixes
+  About 5% of 3.6 fail parsing now. But
+  semantics still needs much to be desired.
+
+uncompyle6 3.0.1 2018-02-17
+
+- All Python 2.6.9 standard library files weakly verify
+- Many 3.6 fixes. 84% of the first 200 standard library files weakly compile.
+  One more big push is needed to get the remaining to compile
+- Many decompilation fixes for other Python versions
+- Add more to the test framework
+- And more add tests target previous existing bugs more completely
+- sync recent license changes in metadata
+
+uncompyle6 3.0.0 2018-02-17
+
+- deparse_code() and lookalikes from the various semantic actions are
+  now deprecated. Instead use new API code_deparse() which makes the
+  version optional and bundles debug options into a dictionary.
+- License changed to GPL3.
+- Many Python 3.6 fixes, especially around handling EXTENDED_ARGS
+  Due to the reduction in operand size for JUMP's there are many
+  more EXTENDED_ARGS instructions which can be the targets
+  of jumps, and messes up the peephole-like analysis that is
+  done for control flow since we don't have something better in place.
+- Code has been reorganized to be more instruction nametuple based where it
+  has been more bytecode array based. There was and still is code that had
+  had magic numbers to advance instructions or to pick out operands.
+- Bug fixes in numerous other Python versions
+- Instruction display improved
+- Keep global statements in fixed order (from wangym5106)
+
+A bit more work is still needed for 3.6 especially in the area of
+function calls and definitions.
+
+
 uncompyle6 2.16.0 2018-02-17
 
 - API additions:
@@ -6,7 +46,7 @@ uncompyle6 2.16.0 2018-02-17
 - Better 2.7 end_if and COME_FROM determination
 - Fix up 3.6+ CALL_FUNCTION_EX
 - Misc pydisasm fixes
-- Wierd comprehension bug seen via new loctraceback
+- Weird comprehension bug seen via new loctraceback
 - Fix Python 3.5+ CALL_FUNCTION_VAR and BUILD_LIST_UNPACK in call; with this
   we can can handle 3.5+ f(a, b, *c, *d, *e) now
 
@@ -59,7 +99,7 @@ Decompilation bug fixes, mostly 3.6 and pre 2.7
 - limit pypy customization to pypy
 - Add addr fields in COME_FROMS
 - Allow use of full instructions in parser reduction routines
-- Reduce grammar in Pythion 3 by specialization more to specific
+- Reduce grammar in Python 3 by specialization more to specific
   Python versions
 - Match Python AST names more closely when possible
 
@@ -77,7 +117,7 @@ uncompyle6 2.14.0 2017-11-26 johnnybamazing
   and remove used grammar rules
 - Fix a number of bytecode decompile problems
   (many more remain)
-- Add stdlib/runtests.sh for even more rigourous testing
+- Add stdlib/runtests.sh for even more rigorous testing
 
 uncompyle6 2.13.3 2017-11-13
 
@@ -101,7 +141,7 @@ Overall: better 3.6 decompiling and some much needed code refactoring and cleanu
   added to assist here. Ignoring errors may be okay because the fragment parser often just needs,
   well, *fragments*.
 - Distinguish RETURN_VALUE from RETURN_END_IF in exception bodies better in 3.6
-- bug in 3.x language changes: import queue va import Queue
+- bug in 3.x language changes: import queue via import Queue
 - reinstate some bytecode tests since decompiling has gotten better
 - Revise how to report a bug
 
@@ -136,8 +176,8 @@ uncompyle6 2.11.4 2017-08-15
 
 * scanner and parser now allow 3-part version string lookups,
   e.g. 2.7.1 We allow a float here, but if passed a string like '2.7'. or
-* unpin 3.5.1. xdis 3.5.4 has been releasd and fixes the problems we had. Use that.
-* some routnes here moved to xdis. Use the xdis version
+* unpin 3.5.1. xdis 3.5.4 has been release and fixes the problems we had. Use that.
+* some routines here moved to xdis. Use the xdis version
 * README.rst: Link typo Name is trepan2 now not trepan
 * xdis-forced change adjust for COMPARE_OP "is-not" in
   semanatic routines. We need "is not".
@@ -233,9 +273,9 @@ uncompyle6 2.9.8 2016-12-16
 - fix bug in --verify option
 - DRY (a little) control-flow detection
 - fix syntax in tuples with one element
-- if AST rule inheritence in Python 2.5
+- if AST rule inheritance in Python 2.5
 - NAME_MODULE removal for Python <= 2.4
-- verifycall fixes for Python <= 2.4
+- verify call fixes for Python <= 2.4
 - more Python lint
 
 uncompyle6 2.9.7 2016-12-16
@@ -271,7 +311,7 @@ uncompyle6 2.9.6 2016-11-20
   in the results.
 - better control flow debugging output
 - Python 2 and 3 detect structure code is more similar
-- Handle Docstrings with embedded tiple quotes (""")
+- Handle Docstrings with embedded triple quotes (""")
 
 uncompyle6 2.9.5 2016-11-13
 

__pkginfo__.py

@@ -1,3 +1,17 @@
+# Copyright (C) 2018 Rocky Bernstein <rocky@gnu.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """uncompyle6 packaging information"""
 
 # To the extent possible we make this file look more like a
@@ -14,14 +28,13 @@ Copyright (C) 2015-2018 Rocky Bernstein <rb@dustyfeet.com>.
 
 classifiers =  ['Development Status :: 5 - Production/Stable',
                 'Intended Audience :: Developers',
+                'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
                 'Operating System :: OS Independent',
                 'Programming Language :: Python',
                 'Programming Language :: Python :: 2.4',
                 'Programming Language :: Python :: 2.5',
                 'Programming Language :: Python :: 2.6',
                 'Programming Language :: Python :: 2.7',
-                'Programming Language :: Python :: 3.1',
-                'Programming Language :: Python :: 3.2',
                 'Programming Language :: Python :: 3.3',
                 'Programming Language :: Python :: 3.4',
                 'Programming Language :: Python :: 3.5',
@@ -41,8 +54,8 @@ entry_points       = {
     ]}
 ftp_url            = None
 install_requires   = ['spark-parser >= 1.8.5, < 1.9.0',
-                      'xdis >= 3.6.9, < 3.7.0']
-license            = 'MIT'
+                      'xdis >= 3.7.0, < 3.8.0']
+license            = 'GPL3'
 mailing_list       = 'python-debugger@googlegroups.com'
 modname            = 'uncompyle6'
 py_modules         = None

admin-tools/pyenv-newer-versions

@@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
-export PYVERSIONS='3.5.3 3.6.3 2.6.9 3.3.6 2.7.14 3.4.2'
+export PYVERSIONS='3.5.5 3.6.4 2.6.9 3.3.7 2.7.14 3.4.8'

admin-tools/run-pyenvlib-test-all.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+# Runs test_pyenvlib.test on all versions of Python master.
+function finish {
+  cd $owd
+}
+
+# FIXME put some of the below in a common routine
+owd=$(pwd)
+trap finish EXIT
+
+cd $(dirname ${BASH_SOURCE[0]})
+if ! source ./pyenv-newer-versions ; then
+    exit $?
+fi
+if ! source ./setup-master.sh ; then
+    exit $?
+fi
+cd ../test
+for version in $PYVERSIONS; do
+    if ! pyenv local $version ; then
+	exit $?
+    fi
+    echo "====== Running test_pyenvlib.py on $version ====="
+    if ! python ./test_pyenvlib.py --weak-verify --max 800 --${version} ; then
+	exit $?
+    fi
+    echo "------ Done test_pyenvlib.py on $version -----"
+done

admin-tools/setup-master.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-PYTHON_VERSION=3.6.3
+PYTHON_VERSION=3.6.4
 
 # FIXME put some of the below in a common routine
 function finish {

pytest/test_deparse.py

@@ -1,5 +1,5 @@
 import pytest
-from uncompyle6.semantics.fragments import deparse_code as deparse, deparsed_find
+from uncompyle6.semantics.fragments import code_deparse as deparse, deparsed_find
 from uncompyle6 import PYTHON_VERSION, PYTHON3
 
 def map_stmts(x, y):
@@ -31,12 +31,13 @@ def list_comp():
 
 def get_parsed_for_fn(fn):
     code = fn.func_code
-    return deparse(PYTHON_VERSION, code)
+    return deparse(code, version=PYTHON_VERSION)
 
 def check_expect(expect, parsed, fn_name):
     debug = False
     i = 2
     max_expect = len(expect)
+    code = get_parsed_for_fn(fn_name)
     for name, offset in sorted(parsed.offsets.keys()):
         assert i+1 <= max_expect, (
             "%s: ran out if items in testing node" % fn_name)

pytest/test_fjt.py

@@ -70,7 +70,7 @@ def test_if_in_for():
     elif 3.2 < PYTHON_VERSION <= 3.4:
         bytecode = Bytecode(code, scan.opc)
         scan.code = array('B', code.co_code)
-        scan.build_lines_data(code)
+        scan.lines = scan.build_lines_data(code)
         scan.build_prev_op()
         scan.insts = list(bytecode)
         scan.offset2inst_index = {}

pytest/test_grammar.py

@@ -66,9 +66,9 @@ def test_grammar():
     expect_dup_rhs = frozenset([('COME_FROM',), ('CONTINUE',), ('JUMP_ABSOLUTE',),
                                 ('LOAD_CONST',),
                                 ('JUMP_BACK',), ('JUMP_FORWARD',)])
-    # reduced_dup_rhs = {k: dup_rhs[k] for k in dup_rhs if k not in expect_dup_rhs}
-    # for k in reduced_dup_rhs:
-    #     print(k, reduced_dup_rhs[k])
+    reduced_dup_rhs = dict((k, dup_rhs[k]) for k in dup_rhs if k not in expect_dup_rhs)
+    for k in reduced_dup_rhs:
+        print(k, reduced_dup_rhs[k])
     # assert not reduced_dup_rhs, reduced_dup_rhs
 
     s = get_scanner(PYTHON_VERSION, IS_PYPY)

pytest/test_token.py

@@ -0,0 +1,23 @@
+from uncompyle6.scanners.tok import Token
+
+def test_token():
+    # Test token formatting of: LOAD_CONST None
+    t = Token('LOAD_CONST', offset=0, attr=None, pattr=None, has_arg=True)
+    expect = '           0  LOAD_CONST               None'
+    # print(t.format())
+    assert t
+    assert t.format() == expect
+
+    # Make sure equality testing of tokens ignores offset
+    t2 = Token('LOAD_CONST', offset=2, attr=None, pattr=None, has_arg=True)
+    assert t2 == t
+
+
+    # Make sure formatting of: LOAD_CONST False. We assume False is the 0th index
+    # of co_consts.
+    t = Token('LOAD_CONST', offset=1, attr=False, pattr=False, has_arg=True)
+    expect = '           1  LOAD_CONST            0  False'
+    assert t.format() == expect
+
+if __name__ == '__main__':
+    test_token()

pytest/testdata/if-2.7.right

@@ -8,5 +8,5 @@
            9  STORE_NAME            2  'b'
           12  JUMP_FORWARD          0  'to 15'
         15_0  COME_FROM            12  '12'
-          15  LOAD_CONST            0  ''
+          15  LOAD_CONST            0  None
           18  RETURN_VALUE

pytest/testdata/ifelse-2.7.right

@@ -11,5 +11,5 @@
    6      15  LOAD_CONST            1  2
           18  STORE_NAME            2  'd'
         21_0  COME_FROM            12  '12'
-          21  LOAD_CONST            2  ''
+          21  LOAD_CONST            2  None
           24  RETURN_VALUE

test/Makefile

@@ -53,6 +53,7 @@ check-3.4: check-bytecode check-3.4-ok check-2.7-ok
 #: Run working tests from Python 3.5
 check-3.5: check-bytecode
 	$(PYTHON) test_pythonlib.py --bytecode-3.5 --weak-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.5-run --verify-run
 
 #: Run working tests from Python 3.6
 check-3.6: check-bytecode

test/run-and-email.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+function displaytime {
+    printf "ran in "
+    local T=$1
+    local D=$((T/60/60/24))
+    local H=$((T/60/60%24))
+    local M=$((T/60%60))
+    local S=$((T%60))
+    (( $D > 0 )) && printf '%d days ' $D
+    (( $H > 0 )) && printf '%d hours ' $H
+    (( $M > 0 )) && printf '%d minutes ' $M
+    (( $D > 0 || $H > 0 || $M > 0 )) && printf 'and '
+    printf '%d seconds\n' $S
+}
+
+PYVERSION=${PYVERSION:-"3.5.5 2.7.14 3.4.8 2.6.9"}
+# PYVERSION=${PYVERSION:-"3.5.5"}
+
+USER=${USER:-rocky}
+EMAIL=${EMAIL:-rb@dustyfeet.com}
+MAX_TESTS=${MAX_TESTS:-800}
+typeset -i RUN_STARTTIME=$(date +%s)
+
+for VERSION in $PYVERSION ; do
+    typeset -i rc=0
+    LOGFILE=/tmp/pyenvlib-$VERSION-$$.log
+
+    if [[ $VERSION == '3.5.5' ]] ; then
+	MAX_TESTS=224
+    else
+	MAX_TESTS=800
+    fi
+
+    if ! pyenv local $VERSION ; then
+	rc=1
+    else
+      echo Python Version $(pyenv local) > $LOGFILE
+      echo "" >> $LOGFILE
+      typeset -i ALL_FILES_STARTTIME=$(date +%s)
+      python ./test_pyenvlib.py --max ${MAX_TESTS} --weak-verify --$VERSION  >>$LOGFILE 2>&1
+      rc=$?
+
+      echo Python Version $(pyenv local) >> $LOGFILE
+      echo "" >>LOGFILE
+
+      typeset -i ALL_FILES_ENDTIME=$(date +%s)
+      (( time_diff =  ALL_FILES_ENDTIME - ALL_FILES_STARTTIME))
+      displaytime $time_diff >> $LOGFILE
+    fi
+
+    SUBJECT_PREFIX="pyenv weak verify (max $MAX_TESTS) for"
+    if ((rc == 0)); then
+	tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION ok" ${USER}@localhost
+    else
+	tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION not ok" ${USER}@localhost
+	tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION not ok" ${EMAIL}
+    fi
+    rm .python-version
+done
+
+typeset -i RUN_ENDTIME=$(date +%s)
+(( time_diff =  RUN_ENDTIME - RUN_STARTTIME))
+elapsed_time=$(displaytime $time_diff)
+echo "Run complete $elapsed_time for versions $PYVERSION" | mail -s "pyenv weak verify in $elapsed_time" ${EMAIL}

test/simple_source/bug25/02_yield_bug.py

@@ -0,0 +1,7 @@
+# From 2.4 test_array.py
+# In Python 2.4 and earlier "yield" is not valid and instead
+# we must use "yield None". Bug was not adding "None"
+
+def yield_bug():
+    yield None
+    return

test/simple_source/bug25/03_try_else.py

@@ -1,18 +1,17 @@
-# From Python 2.4. test_cgi.py
-# Bug was in putting  try block inside the ifelse statement.
-
-# Note: this is a self testing program - will assert on failure.
-def do_test(method):
-    if method == "GET":
-        rc = 0
-    elif method == "POST":
-        rc = 1
-    else:
-        raise ValueError, "unknown method: %s" % method
+# Bug found in 2.4 test_math.py
+# Bug was turning last try/except/else into try/else
+import math
+def test_exceptions():
     try:
-        rc = 2
-    except ZeroDivisionError:
-        rc = 3
-    return rc
+        x = math.exp(-1000000000)
+    except:
+        raise RuntimeError
 
-assert 2 == do_test("GET")
+    try:
+        x = math.sqrt(-1.0)
+    except ValueError:
+        return x
+    else:
+        raise RuntimeError
+
+test_exceptions()

test/simple_source/bug25/04_try_else_confuse.py

@@ -0,0 +1,19 @@
+# From 2.4 test_sax.py
+# Bug was distinguishing try from try/else
+
+def verify_empty_attrs():
+    gvqk = 3
+    try:
+        gvk = 1/0
+    except ZeroDivisionError:
+        gvk = 1
+
+    try:
+        gvqk = 0
+    except KeyError:
+        gvqk = 1
+
+    # If try/else was used above the return will be 4
+    return gvk + gvqk
+
+assert 1 == verify_empty_attrs()

test/simple_source/bug25/08_if_while_else.py

@@ -0,0 +1,13 @@
+# From 2.3 Queue.py
+# Bug was adding COME_FROM from while
+# confusing the else
+def put(item, block=True, timeout=None):
+    if block:
+        if timeout:
+            while True:
+                if item:
+                    block = 1
+        else:
+            block = 5
+    elif item:
+        block = False

test/simple_source/bug26/02_while1_if_and.py

@@ -0,0 +1,19 @@
+# From 2.6.9 ftplib.py
+# Bug was handling if with "and' inside while1
+def getmultiline(line):
+    if line[3]:
+        while 1:
+            if line[2] and line[5]:
+                break
+    return
+
+# From 2.6.9 refactor.py
+def _detect_future_features(tp):
+    while True:
+        if tp == 6:
+            while tp == 7:
+                if tp != 11:
+                    break
+        else:
+            break
+    return

test/simple_source/bug26/03_tryelse_continue.py

@@ -21,5 +21,33 @@ def call(*args):
     except KeyError:
         return 2
     except TypeError:
-        # Unhashable argument
         return 3
+
+
+# From 2.6.9 pdb.py
+# Here we have a "try/except" inside a "try/except/else and we can't
+# distinguish which COME_FROM comes from which "try".
+
+def do_jump(self, arg):
+    try:
+        arg(1)
+    except ValueError:
+        arg(2)
+    else:
+        try:
+            arg(3)
+        except ValueError:
+            arg(4)
+
+# From 2.6.9 smtpd.py
+# Bug was that the for can cause multiple COME_FROMs at the
+# of the try block
+def _deliver(self, s, mailfrom, rcpttos):
+    try:
+        mailfrom(1)
+    except RuntimeError:
+        mailfrom(2)
+    except IndexError:
+        for r in s:
+            mailfrom()
+    return

test/simple_source/bug26/08_distbug.py

@@ -0,0 +1,13 @@
+# From 2.3.7 dis.py. Bug ranged from 2.2 to 2.6.
+# bug was in "while". uncompyle6 doesn't
+# add in a COME_FROM after the while. Maybe it should?
+
+def distb(tb=None):
+    """Disassemble a traceback (default: last traceback)."""
+    if tb is None:
+        try:
+            tb = sys.last_traceback
+        except AttributeError:
+            raise RuntimeError, "no last traceback to disassemble"
+        while tb.tb_next: tb = tb.tb_next
+    disassemble(tb.tb_frame.f_code, tb.tb_lasti)

test/simple_source/bug27+/02_assert.py

@@ -0,0 +1,17 @@
+# From 2.7 test_argparse.py
+# Bug was turnning assert into an "or raise" statement
+def __call__(arg, dest):
+    try:
+        assert arg == 'spam', 'dest: %s' % dest
+    except:
+        raise
+
+__call__('spam', __file__)
+
+# From python 2.7.14 lib2to3/refactor.py
+# Bug was mangling assert turning if into "or"
+def refactor_doctest(clipped, new):
+    assert clipped, clipped
+    if not new:
+        new += u"\n"
+    return

test/simple_source/bug27+/03_not_dead_code.py

@@ -0,0 +1,9 @@
+# Bug found in 2.7 test_itertools.py
+# Bug was erroneously using reduction to unconditional_true
+# A proper fix would be to use unconditional_true only when we
+# can determine there is or was dead code.
+from itertools import izip_longest
+for args in [['abc', range(6)]]:
+    target = [tuple([arg[i] if i < len(arg) else None for arg in args])
+              for i in range(max(map(len, args)))]
+    assert list(izip_longest(*args)) ==  target

test/simple_source/bug27+/05_for_try_else.py

@@ -0,0 +1,20 @@
+# Bug found in 2.7 test_itertools.py
+def test_iziplongest(self):
+
+    # Having a for loop seems important
+    for args in ['abc']:
+        self.assertEqual(1, 2)
+
+    pass  # Having this seems important
+
+    # The bug was the except jumping back
+    # to the beginning of this for loop
+    for stmt in [
+        "izip_longest('abc', fv=1)",
+    ]:
+        try:
+            eval(stmt)
+        except TypeError:
+            pass
+        else:
+            self.fail()

test/simple_source/bug27+/05_not_unconditional.py

@@ -0,0 +1,12 @@
+# From 2.7 test_itertools.py
+# Bug was in 2.7 decompiling like the commented out
+# code below
+from itertools import izip_longest
+for args in [
+        ['abc', range(6)],
+        ]:
+    # target = [tuple([ arg[i] if 1 else None for arg in args if i < len(arg) ])
+    #          for i in range(max(map(len, args)))]
+    target = [tuple([arg[i] if i < len(arg) else None for arg in args])
+              for i in range(max(map(len, args)))]
+    assert list(izip_longest(*args)) == target

test/simple_source/bug33/03_func_params.py

@@ -4,3 +4,14 @@ def __new__(cls, encode, decode, streamreader=None, streamwriter=None,
     incrementalencoder=None, incrementaldecoder=None, name=None,
     *, _is_text_encoding=None):
     return
+
+# From 3.3 _pyio.py. A closure is created here.
+# This changes how the default params are found
+class StringIO(object):
+    def __init__(self, initial_value="", newline="\n"):
+        super(StringIO, self).__init__()
+
+# No closure created here
+class StringIO2(object):
+    def __init__(self, initial_value="", newline="\n"):
+        return 5

test/simple_source/bug33/05_nonlocal.py

@@ -0,0 +1,12 @@
+# From Python 3.6 functools.py
+# Bug was in detecting "nonlocal" access
+def not_bug():
+    cache_token = 5
+
+    def register():
+        nonlocal cache_token
+        return cache_token == 5
+
+    return register()
+
+assert not_bug()

test/simple_source/bug33/10_while1_popblock.py

@@ -0,0 +1,17 @@
+# From 3.4.4 mailcap.py
+# Bug was needing a grammar rule to add POP_BLOCK before the end of the while1.
+# 3.3 apparently doesn't add this.
+def readmailcapfile(line):
+    while 1:
+        if not line: break
+        if line[0] == '#' or line.strip() == '':
+            continue
+        if not line:
+            continue
+        for j in range(3):
+            line[j] = line[j].strip()
+        if '/' in line:
+            line['/'].append('a')
+        else:
+            line['/'] = 'a'
+    return

test/simple_source/bug34/05_while1_if_continue.py

@@ -0,0 +1,37 @@
+# Bug in Python 3.4 text_file.py
+# Bug is handling:  while true ... if ... continue
+def readline(b):
+    a = 1
+    while True:
+        if b:
+            if b[0]:
+                a = 2
+                b = None
+                continue
+        b = None
+        a = 5
+
+        return a
+
+assert readline(None) == 1
+assert readline([2]) == 2
+
+def readline2(self):
+    while True:
+        line = 5
+        if self[0]:
+            if self:
+                self[0] = 1
+                continue
+
+        return line + self[0]
+
+# From 3.4.4 connection.py
+def PipeClient(address):
+    while 1:
+        try:
+            address += 1
+        except OSError as e:
+            raise e
+    else:
+        raise

test/simple_source/bug36/01_call_function.py

@@ -1,5 +1,30 @@
 # Python 3.6's changes for calling functions.
 # See https://github.com/rocky/python-uncompyle6/issues/58
-# CALL_FUNCTION_EX takes 2 to 3 arguments on the stack: the function, the tuple of positional arguments,
-# and optionally the dict of keyword arguments if bit 0 of oparg is 1.
-a(*[])
+
+# CALL_FUNCTION_EX takes 2 to 3 arguments on the stack:
+# * the function,
+# * the tuple of positional arguments, and optionally
+# * the dict of keyword arguments if bit 0 of oparg is 1.
+from foo import f, dialect, args, kwds, reader
+
+f(*[])
+
+# From Python 3.6 csv.py
+# (f, dialect) are positional arg tuples, *args, is by itself, i.e.
+# no tuple.
+x = reader(f, dialect, *args, **kwds)
+
+# From 3.6 functools.py
+# Below there is a load_closure instruction added
+def cmp_to_key(mycmp):
+    class K(object):
+        def __ge__():
+            return mycmp()
+    return
+
+# In this situation though, there is no load_closure
+def cmp2_to_key(mycmp):
+    class K2(object):
+        def __ge__():
+            return 5
+    return

test/simple_source/bug36/01_fstring.py

@@ -1,5 +1,18 @@
+# Self-checking 3.6+ string interpolation tests
+
 var1 = 'x'
 var2 = 'y'
-print(f'interpolate {var1} strings {var2!r} {var2!s} py36')
-print(f'{abc}0')
-print(f'{abc}{abc!s}')
+abc  = 'def'
+assert (f'interpolate {var1} strings {var2!r} {var2!s} py36' ==
+        "interpolate x strings 'y' y py36")
+assert 'def0' == f'{abc}0'
+assert 'defdef' == f'{abc}{abc!s}'
+
+# From 3.6 functools.py
+# Bug was handling format operator strings.
+
+k, v = "1", ["2"]
+x = f"{k}={v!r}"
+y = f"functools.{x}({', '.join(v)})"
+assert x == "1=['2']"
+assert y == "functools.1=['2'](2)"

test/simple_source/bug36/02_kwargs.py

@@ -1,5 +1,13 @@
 # From 3.6 _markupbase _parse_doctype_subset()
-def bug(self, j):
+def bug(self, j, a, b):
     self.parse_comment(j, report=0)
     self.parse_comment(j, report=1, foo=2)
     self.parse_comment(a, b, report=3)
+
+# From 3.6 fnmatch.py
+# Bug was precidence parenthesis around decorator
+
+import functools
+@functools.lru_cache(maxsize=256, typed=True)
+def _compile_pattern(pat):
+    pass

test/simple_source/bug36/03_fn_defaults.py

@@ -7,3 +7,9 @@ def foo3(bar, baz=1, qux=2):
     return 3
 def foo4(bar, baz, qux=1, quux=2):
     return 4
+
+# From 3.6 compileall.
+# Bug was in omitting default which when used in an "if"
+# are treated as False would be
+def _walk_dir(dir, ddir=None, maxlevels=10, quiet=0):
+    return

test/simple_source/bug36/03_try_return_except.py

@@ -0,0 +1,30 @@
+# From Python 3.6 bdb.py
+# Bug was handling try's with returns
+# END_FINALLY in 3.6 starts disasppearing
+
+def effective(possibles):
+    for b in possibles:
+        try:
+            return 1
+        except:
+            return 2
+    return 3
+
+assert effective([5]) == 1
+assert effective([]) == 3
+
+def effective2(possibles):
+    b = 0
+    for b in possibles:
+        try:
+            if b >= 5:
+                b = 5
+            else:
+                return 2
+        except:
+            return 3
+    return b
+
+assert effective2([5]) == 5
+assert effective2([]) == 0
+assert effective2(['a']) == 3

test/simple_source/bug36/04_class_kwargs.py

@@ -0,0 +1,17 @@
+# From 3.6 test_abc.py
+# Bug was Reciever() class definition
+import abc
+import unittest
+class TestABCWithInitSubclass(unittest.TestCase):
+    def test_works_with_init_subclass(self):
+        class ReceivesClassKwargs:
+            def __init_subclass__(cls, **kwargs):
+                super().__init_subclass__()
+        class Receiver(ReceivesClassKwargs, abc.ABC, x=1, y=2, z=3):
+            pass
+
+def test_abstractmethod_integration(self):
+    for abstractthing in [abc.abstractmethod]:
+        class C(metaclass=abc.ABCMeta):
+            @abstractthing
+            def foo(self): pass  # abstract

test/simple_source/bug36/04_try_finally.py

@@ -0,0 +1,33 @@
+# From 3.6 _pyio.py
+# Bug was in "return" not having "COME_FROM"
+# and in 1st try/finally no END_FINALLY (which really
+# hooks into the control-flow analysis).
+# The 2nd try/finally has an END_FINALLY although still
+# no "COME_FROM".
+
+def getvalue(self):
+    try:
+        return 3
+    finally:
+        return 1
+
+
+def getvalue1(self):
+    try:
+        return 4
+    finally:
+        pass
+    return 2
+
+# From Python 3.6 asynchat.py
+# Bug is handling as why in the face of a return.
+# uncompyle6 shows removal of "why" after the return.
+def handle_read(self):
+    try:
+        data = 5
+    except ZeroDivisionError:
+        return
+    except OSError as why:
+        return why
+
+    return data

test/simple_source/bug36/05_36lambda.py

@@ -0,0 +1,20 @@
+# From Python 3.6 hmac.py
+# needed to change mklambda rule
+def __init__(self, msg = None, digestmod = None):
+    self.digest_cons = lambda d='': digestmod.new(d)
+
+# From Python 3.6 functools.py
+# Bug was handling lambda for MAKE_FUNCTION_8 (closure)
+# vs to MAKE_FUNCTION_9 (pos_args + closure)
+def bug():
+    def register(cls, func=None):
+        return lambda f: register(cls, f)
+
+# From Python 3.6 configparser.py
+def items(self, d, section=5, raw=False, vars=None):
+    if vars:
+        for key, value in vars.items():
+            d[self.optionxform(key)] = value
+    d = lambda option: self._interpolation.before_get(self,
+        section, option, d[option], d)
+    return

test/simple_source/bug36/05_call_function_kw2.py

@@ -0,0 +1,4 @@
+# From 3.6 _pydecimal. Bug was handling
+# keyword args in the return (CALL_FUNCTION_KW_2)
+def to_eng_string(self, context=None):
+    return self.__str__(eng=True, context=context)

test/simple_source/bug36/05_call_star_kw.py

@@ -0,0 +1,17 @@
+# From 3.6 base64.py. Bug was handling *, and keyword args
+def a85decode(b, *, foldspaces=False, adobe=False, ignorechars=b' \t\n\r\v'):
+    return
+
+# From 3.6 configparser.py. Same problem as above.
+_UNSET = object()
+def get(self, section, option, *, raw=False, vars=None, fallback=_UNSET):
+    return
+
+# From 3.6 compileall.py Bug is making default values are in quotes
+def compile_command(source, filename="<input>", symbol="single"):
+    return
+
+# From 3.6 _pyio.py. Bug was in getting order of metaclass=abc.ABCMeta right
+import abc
+class IOBase(metaclass=abc.ABCMeta):
+    pass

test/simple_source/bug36/05_if_and_comp.py

@@ -0,0 +1,12 @@
+# From 3.6 base64.py
+# Bug was handling "and" condition in the presense of POP_JUMP_IF_FALSE
+# locations
+def _85encode(foldnuls, words):
+    return ['z' if foldnuls and word
+                else  'y'
+                for word in words]
+
+# From Python 3.6 enum.py
+
+def __new__(metacls, cls, bases, classdict):
+    {k: classdict[k] for k in classdict._member_names}

test/simple_source/bug36/05_while_and_if.py

@@ -0,0 +1,13 @@
+# From Python 3.6 getopt.py
+# Bug showing that "while" can have several "COME_FROMS" before loop end
+# NOTE: uncompyle6 still gets the "if"s wrong.
+def getopt(args):
+    while args and args[0] and args[0] != '-':
+        if args[0] == '--':
+            break
+        if args[0]:
+            opts = 5
+        else:
+            opts = 6
+
+    return opts

test/simple_source/bug36/06_listcomp_nest.py

@@ -0,0 +1,24 @@
+# From 3.6 _sitebuiltins.py
+# Bug was in handling double nested kinds of things like:
+#     for a in b for c in d
+
+# This required grammar modification and
+# and semantic action changes. LOAD_CLOSUREs are stored
+# inside a MAKE_TUPLE.
+
+# FIXME: test and try additional "if" clauses.
+def __init__(self, path, name, files=(), dirs=(), volumes=()):
+    f = [path.join(dir, filename)
+        for dir in dirs
+        for filename in files]
+    f2 = [path.join(drive, dir, filename)
+         for dir in dirs
+         for filename in files
+         for drive in volumes]
+    return f, f2
+
+# From 3.6 codeop. The below listcomp is generated still
+# like it was in 3.5
+import __future__
+_features = [getattr(__future__, fname)
+             for fname in __future__.all_feature_names]

test/simple_source/bug36/09_ext_arg_jump.py

@@ -0,0 +1,37 @@
+# From 3.6 argparse. Bug was in handling EXTENDED_ARGS in a JUMP_FORWARD
+# messing up control flow detection
+def _format_usage(self, usage, actions, groups, prefix):
+    if usage:
+        usage = usage % dict(prog=self._prog)
+
+    elif usage is None:
+        prog = 5
+
+        for action in actions:
+            if action.option_strings:
+                actions.append(action)
+            else:
+                actions.append(action)
+
+        action_usage = format(optionals + positionals, groups)
+
+        text_width = self._width - self._current_indent
+        if len(prefix) + len(usage) > text_width:
+
+            if len(prefix) + len(prog) <= 0.75 * text_width:
+                indent = ' ' * (len(prefix) + len(prog) + 1)
+                if opt_parts:
+                    lines.extend(get_lines(pos_parts, indent))
+                elif pos_parts:
+                    lines = get_lines([prog] + pos_parts, indent, prefix)
+                else:
+                    lines = [prog]
+
+            else:
+                if len(lines) > 1:
+                    lines.extend(get_lines(pos_parts, indent))
+                lines = [prog] + lines
+
+            usage = '\n'.positionals(lines)
+
+    return

test/simple_source/bug36/09_while_if_while.py

@@ -0,0 +1,9 @@
+# From 3.6 _markupbase.py
+# Bug was parsing the inner while
+def _parse_doctype_subset(c, j, rawdata, n):
+    while n:
+        if c:
+            j += 1
+            while j < n and rawdata[j]:
+                j += 1
+    return -1

test/simple_source/comprehension/05_dict_comp.py

@@ -0,0 +1,8 @@
+# Issue #162
+def x(s):
+    return {k: v
+            for (k, v) in s
+            if not k.startswith('_')
+    }
+
+assert x((('_foo', None),)) == {}

test/simple_source/stmts/01_rel_import.py

@@ -0,0 +1,2 @@
+# Tests relative imports
+from . import bogus

test/simple_source/stmts/02_while1else.py

@@ -6,3 +6,16 @@ def PipeClient(address):
     else:
         raise
     return
+
+# From 2.6.9 sre.py
+# Bug was parsing inner while1. Our massaging adds a COME_FROM
+# possibly in the wrong place. When control flow is
+# redone possibly all of this mess will disappear.
+def _parse(source, state, this, group, char):
+    while 1:
+        if this:
+            while 1:
+                raise RuntimeError
+        else:
+            raise IndexError
+    return

test/stdlib/run-and-email.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+USER=${USER:-rocky}
+EMAIL=${EMAIL:-rb@dustyfeet.com}
+SUBJECT_PREFIX="stdlib unit testing for"
+for VERSION in 2.7.14 2.6.9 ; do
+    typeset -i rc=0
+    LOGFILE=/tmp/runtests-$VERSION-$$.log
+    if ! pyenv local $VERSION ; then
+	rc=1
+    else
+      /bin/bash ./runtests.sh  >$LOGFILE 2>&1
+      rc=$?
+    fi
+    if ((rc == 0)); then
+	tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION ok" ${USER}@localhost
+    else
+	tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION not ok" ${USER}@localhost
+	tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION not ok" $EMAIL
+    fi
+done

test/stdlib/runtests.sh

@@ -27,24 +27,18 @@ case $PYVERSION in
 	SKIP_TESTS=(
 	    [test_dis.py]=1   # We change line numbers - duh!
 	    [test_grp.py]=1      # Long test - might work Control flow?
-	    [test_math.py]=1 # Control flow?
 	    [test_pwd.py]=1 # Long test - might work? Control flow?
 	    [test_queue.py]=1 # Control flow?
-	    [test_sax.py]=1  # Control flow?
 	    # [test_threading.py]=1 # Long test - works
-	    [test_types.py]=1 # Control flow?
 	)
 	;;
     2.5)
 	SKIP_TESTS=(
-	    [test_contextlib.py]=1
-	    [test_dis.py]=1   # We change line numbers - duh!
-	    [test_exceptions.py]=1
-	    [test_functools.py]=1
-	    [test_grammar.py]=1  # Too many stmts. Handle large stmts
-	    [test_grp.py]=1      # Long test - might work Control flow?
-	    [test_math.py]=1 # Control flow?
-	    [test_pdb.py]=1
+	    [test_contextlib.py]=1 # Syntax error - look at
+	    [test_dis.py]=1        # We change line numbers - duh!
+	    [test_grammar.py]=1    # Too many stmts. Handle large stmts
+	    [test_grp.py]=1        # Long test - might work Control flow?
+	    [test_pdb.py]=1        # Line-number specific
 	    [test_pwd.py]=1 # Long test - might work? Control flow?
 	    [test_queue.py]=1 # Control flow?
 	    [test_re.py]=1 # Probably Control flow?
@@ -54,11 +48,16 @@ case $PYVERSION in
 	;;
     2.6)
 	SKIP_TESTS=(
+	    [test_compile.py]=1  # Intermittent - sometimes works and sometimes doesn't
 	    [test_grp.py]=1      # Long test - might work Control flow?
 	    [test_opcodes.py]=1
 	    [test_pwd.py]=1 # Long test - might work? Control flow?
 	    [test_re.py]=1 # Probably Control flow?
+	    [test_queue.py]=1 # Control flow?
+	    [test_strftime.py]=1
 	    [test_trace.py]=1  # Line numbers are expected to be different
+	    [test_zipfile64.py]=1  # Skip Long test
+	    [test_zlib.py]=1  # Look at
 	    # .pyenv/versions/2.6.9/lib/python2.6/lib2to3/refactor.pyc
 	    # .pyenv/versions/2.6.9/lib/python2.6/pyclbr.pyc
 	    # .pyenv/versions/2.6.9/lib/python2.6/quopri.pyc -- look at ishex, is short
@@ -71,13 +70,19 @@ case $PYVERSION in
 	;;
     2.7)
 	SKIP_TESTS=(
+	    # These are ok, but our test machine POWER has problems
+	    # so we skip..
+	    [test_httplib.py]=1  # Ok, but POWER has problems with this
+	    [test_pdb.py]=1 # Ok, but POWER has problems with this
+
 	    [test_curses.py]=1  # Possibly fails on its own but not detected
 	    [test_dis.py]=1   # We change line numbers - duh!
 	    [test_doctest.py]=1 # Fails on its own
 	    [test_grammar.py]=1  # Too many stmts. Handle large stmts
 	    [test_io.py]=1 # Test takes too long to run
 	    [test_ioctl.py]=1 # Test takes too long to run
-	    [test_itertools.py]=1 # Syntax error - look at!
+	    [test_itertools.py]=1 # Fix erroneous reduction to "conditional_true".
+	                          # See test/simple_source/bug27+/05_not_unconditional.py
 	    [test_memoryio.py]=1 # FIX
 	    [test_multiprocessing.py]=1 # On uncompyle2, taks 24 secs
 	    [test_pep352.py]=1 # ?
@@ -92,9 +97,23 @@ case $PYVERSION in
 	    [test_zipfile64.py]=1  # Runs ok but takes 204 seconds
         )
 	;;
+    3.5)
+	SKIP_TESTS=(
+	    [test_decorators.py]=1  # Control flow wrt "if elif"
+	)
+	;;
+    3.6)
+	SKIP_TESTS=(
+	    [test_contains.py]=1    # Code "while False: yield None" is optimized away in compilation
+	    [test_decorators.py]=1  # Control flow wrt "if elif"
+	    [test_pow.py]=1         # Control flow wrt "continue"
+	)
+	;;
     *)
-	SKIP_TESTS=( [test_aepack.py]=1 [audiotests.py]=1
+	SKIP_TESTS=( [test_aepack.py]=1
+		     [audiotests.py]=1
 		     [test_dis.py]=1   # We change line numbers - duh!
+		     [test_generators.py]=1  # I think string formatting of docstrings gets in the way. Not sure
 		   )
 	;;
 esac
@@ -174,7 +193,7 @@ typeset -i ALL_FILES_ENDTIME=$(date +%s)
 
 (( time_diff =  ALL_FILES_ENDTIME - ALL_FILES_STARTTIME))
 
-printf "Ran $i tests in "
+printf "Ran $i unit-test files in "
 displaytime $time_diff
 
 exit $allerrs

test/test_pyenvlib.py

@@ -9,6 +9,7 @@ Usage-Examples:
   test_pyenvlib.py --all --verify	# decomyile all tests and verify results
   test_pyenvlib.py --test		# decompile only the testsuite
   test_pyenvlib.py --2.7.12 --verify	# decompile and verify python lib 2.7.11
+  test_pyenvlib.py --3.6.4 --max 10	# decompile first 10 of 3.6.4
 
 Adding own test-trees:
 
@@ -115,8 +116,10 @@ def do_tests(src_dir, patterns, target_dir, start_with=None,
             files = files[:max_files]
 
     print(time.ctime())
-    main.main(src_dir, target_dir, files, [], do_verify=do_verify)
+    (tot_files, okay_files, failed_files,
+     verify_failed_files) = main.main(src_dir, target_dir, files, [], do_verify=do_verify)
     print(time.ctime())
+    return verify_failed_files + failed_files
 
 if __name__ == '__main__':
     import getopt, sys
@@ -160,15 +163,19 @@ if __name__ == '__main__':
             '/tmp/spark-grammar-%s.cover' % vers
             )
 
+    failed = 0
     for src_dir, pattern, target_dir in test_dirs:
         if os.path.exists(src_dir):
             target_dir = os.path.join(target_base, target_dir)
             if os.path.exists(target_dir):
                 shutil.rmtree(target_dir, ignore_errors=1)
-            do_tests(src_dir, pattern, target_dir, start_with,
-                     do_verify, test_options['max='])
+            failed += do_tests(src_dir, pattern, target_dir, start_with,
+                               do_verify, test_options['max='])
         else:
             print("### Path %s doesn't exist; skipping" % src_dir)
+            pass
+        pass
+    sys.exit(failed)
 
 # python 1.5:
 

uncompyle6/__init__.py

@@ -1,7 +1,7 @@
 """
-  Copyright (c) 1999 John Aycock
+  Copyright (c) 2015, 2018 by Rocky Bernstein
   Copyright (c) 2000 by hartmut Goebel <h.goebel@crazy-compilers.com>
-  Copyright (c) 2015 by Rocky Bernstein
+  Copyright (c) 1999 John Aycock
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -55,6 +55,10 @@ from uncompyle6.main import decompile_file
 uncompyle_file = decompile_file
 
 # Conventience functions so you can say:
-# from uncompyle6 import deparse_code
+# from uncompyle6 import (code_deparse, deparse_code2str)
 
+code_deparse = uncompyle6.semantics.pysource.code_deparse
+deparse_code2str = uncompyle6.semantics.pysource.deparse_code2str
+
+# This is deprecated:
 deparse_code = uncompyle6.semantics.pysource.deparse_code

uncompyle6/disas.py

@@ -1,7 +1,20 @@
-# Copyright (c) 2015-2016, 2818 by Rocky Bernstein
-# Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org>
-# Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
-# Copyright (c) 1999 John Aycock
+#  Copyright (c) 2015-2016, 2818 by Rocky Bernstein
+#  Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org>
+#  Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
+#  Copyright (c) 1999 John Aycock
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 CPython magic- and version- independent disassembly routines

uncompyle6/linenumbers.py

@@ -1,3 +1,18 @@
+#  Copyright (c) 2015-2016, 2818 by Rocky Bernstein
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 from collections import deque
 
 from xdis.code import iscode

uncompyle6/main.py

@@ -1,6 +1,21 @@
-import datetime, os, subprocess, sys, tempfile
+# Copyright (C) 2018 Rocky Bernstein <rocky@gnu.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from uncompyle6 import verify, IS_PYPY, PYTHON_VERSION
+import datetime, os, subprocess, sys
+
+from uncompyle6 import verify, IS_PYPY
 from xdis.code import iscode
 from uncompyle6.disas import check_object_path
 from uncompyle6.semantics import pysource
@@ -8,8 +23,8 @@ from uncompyle6.parser import ParserError
 from uncompyle6.version import VERSION
 # from uncompyle6.linenumbers import line_number_mapping
 
-from uncompyle6.semantics.pysource import deparse_code
-from uncompyle6.semantics.fragments import deparse_code as deparse_code_fragments
+from uncompyle6.semantics.pysource import code_deparse
+from uncompyle6.semantics.fragments import code_deparse  as code_deparse_fragments
 from uncompyle6.semantics.linemap import deparse_code_with_map
 
 from xdis.load import load_module
@@ -23,12 +38,12 @@ def _get_outstream(outfile):
         os.makedirs(dir)
     except OSError:
         pass
-    return open(outfile, 'w')
+    return open(outfile, 'wb')
 
 def decompile(
         bytecode_version, co, out=None, showasm=None, showast=False,
         timestamp=None, showgrammar=False, code_objects={},
-        source_size=None, is_pypy=False, magic_int=None,
+        source_size=None, is_pypy=None, magic_int=None,
         mapstream=None, do_fragments=False):
     """
     ingests and deparses a given code block 'co'
@@ -74,6 +89,12 @@ def decompile(
         real_out.write('# Size of source mod 2**32: %d bytes\n' %
                        source_size)
 
+    debug_opts = {
+        'asm': showasm,
+        'ast': showast,
+        'grammar': showgrammar
+    }
+
     try:
         if mapstream:
             if isinstance(mapstream, str):
@@ -91,12 +112,12 @@ def decompile(
             mapstream.write("\n\n# %s\n" % linemap)
         else:
             if do_fragments:
-                deparse_fn = deparse_code_fragments
+                deparse_fn = code_deparse_fragments
             else:
-                deparse_fn = deparse_code
-            deparsed = deparse_fn(bytecode_version, co, out, showasm, showast,
-                                  showgrammar, code_objects=code_objects,
-                                      is_pypy=is_pypy)
+                deparse_fn = code_deparse
+            deparsed = deparse_fn(co, out, bytecode_version,
+                                  debug_opts = debug_opts,
+                                  is_pypy=is_pypy)
             pass
         return deparsed
     except pysource.SourceWalkerError, e:
@@ -224,6 +245,7 @@ def main(in_base, out_base, files, codes, outfile=None,
             sys.stdout.write("\n")
             sys.stderr.write("# file %s\n" % (infile))
             failed_files += 1
+            tot_files += 1
         except KeyboardInterrupt:
             if outfile:
                 outstream.close()
@@ -250,7 +272,7 @@ def main(in_base, out_base, files, codes, outfile=None,
                                                                do_verify)
                         if not current_outfile:
                             if not msg:
-                                print '\n# okay decompiling %s' % infile
+                                print('\n# okay decompiling %s' % infile)
                                 okay_files += 1
                             else:
                                 verify_failed_files += 1

uncompyle6/parser.py

@@ -1,7 +1,20 @@
-#  Copyright (c) 2015-2017 Rocky Bernstein
+#  Copyright (c) 2015-2018 Rocky Bernstein
 #  Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org>
 #  Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
 #  Copyright (c) 1999 John Aycock
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 Common uncompyle6 parser routines.
 """
@@ -416,9 +429,6 @@ class PythonParser(GenericASTBuilder):
 
         for_block ::= l_stmts_opt _come_froms JUMP_BACK
 
-        for       ::= SETUP_LOOP expr for_iter store
-                      for_block POP_BLOCK _come_froms
-
         forelsestmt ::= SETUP_LOOP expr for_iter store
                         for_block POP_BLOCK else_suite _come_froms
 

uncompyle6/parsers/parse2.py

@@ -1,8 +1,21 @@
 #  Copyright (c) 2015-2017 Rocky Bernstein
 #  Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
+#
 #  Copyright (c) 1999 John Aycock
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-A spark grammar for Python 2.x.
+Base grammar for Python 2.x.
 
 However instead of terminal symbols being the usual ASCII text,
 e.g. 5, myvariable, "for", etc.  they are CPython Bytecode tokens,
@@ -80,6 +93,9 @@ class Python2Parser(PythonParser):
         raise_stmt2 ::= expr expr RAISE_VARARGS_2
         raise_stmt3 ::= expr expr expr RAISE_VARARGS_3
 
+        for         ::= SETUP_LOOP expr for_iter store
+                        for_block POP_BLOCK _come_froms
+
         del_stmt ::= expr DELETE_SLICE+0
         del_stmt ::= expr expr DELETE_SLICE+1
         del_stmt ::= expr expr DELETE_SLICE+2
@@ -173,6 +189,7 @@ class Python2Parser(PythonParser):
     def p_expr2(self, args):
         """
         expr ::= LOAD_LOCALS
+        expr ::= LOAD_ASSERT
         expr ::= slice0
         expr ::= slice1
         expr ::= slice2
@@ -306,9 +323,9 @@ class Python2Parser(PythonParser):
                     ], customize)
                     if self.version >= 2.7:
                         self.add_unique_rule(
-                            'dictcomp_func ::= BUILD_MAP_n LOAD_FAST FOR_ITER store '
+                            'dict_comp_func ::= BUILD_MAP_n LOAD_FAST FOR_ITER store '
                             'comp_iter JUMP_BACK RETURN_VALUE RETURN_LAST',
-                            'dictcomp_func', 0, customize)
+                            'dict_comp_func', 0, customize)
 
                 else:
                     kvlist_n = "kvlist_%s" % token.attr
@@ -503,6 +520,7 @@ class Python2Parser(PythonParser):
 
         self.check_reduce['aug_assign1'] = 'AST'
         self.check_reduce['aug_assign2'] = 'AST'
+        self.check_reduce['or'] = 'AST'
         # self.check_reduce['_stmts'] = 'AST'
 
         # Dead code testing...
@@ -518,8 +536,11 @@ class Python2Parser(PythonParser):
         # if lhs == 'while1elsestmt':
         #     from trepan.api import debug; debug()
 
-        if lhs in ('aug_assign1', 'aug_assign2') and ast[0] and ast[0][0] == 'and':
+        if lhs in ('aug_assign1', 'aug_assign2') and ast[0] and ast[0][0] in ('and', 'or'):
             return True
+        if rule == ('or', ('expr', 'jmp_true', 'expr', '\\e_come_from_opt')):
+            expr2 = ast[2]
+            return expr2 == 'expr' and expr2[0] == 'LOAD_ASSERT'
         return False
 
 class Python2ParserSingle(Python2Parser, PythonParserSingle):

uncompyle6/parsers/parse22.py

@@ -18,6 +18,10 @@ class Python22Parser(Python23Parser):
                       COME_FROM POP_TOP COME_FROM
         list_for  ::= expr for_iter store list_iter CONTINUE JUMP_FORWARD
                       COME_FROM POP_TOP COME_FROM
+
+        # Some versions of Python 2.2 have been found to generate
+        # PRINT_ITEM_CONT for PRINT_ITEM
+        print_items_stmt ::= expr PRINT_ITEM_CONT print_items_opt
         '''
 
     def customize_grammar_rules(self, tokens, customize):

uncompyle6/parsers/parse23.py

@@ -32,6 +32,9 @@ class Python23Parser(Python24Parser):
         while1stmt ::= _while1test l_stmts_opt JUMP_BACK
                        POP_TOP POP_BLOCK COME_FROM
 
+        while1stmt ::= _while1test l_stmts_opt JUMP_BACK
+                       POP_TOP POP_BLOCK
+
         while1stmt ::= _while1test l_stmts_opt JUMP_BACK
                        COME_FROM POP_TOP POP_BLOCK COME_FROM
 

uncompyle6/parsers/parse24.py

@@ -33,8 +33,8 @@ class Python24Parser(Python25Parser):
         import_cont    ::= filler LOAD_CONST alias
 
         # Python 2.5+ omits POP_TOP POP_BLOCK
-        while1stmt ::= SETUP_LOOP l_stmts JUMP_BACK POP_TOP POP_BLOCK COME_FROM
         while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_TOP POP_BLOCK COME_FROM
+        while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_TOP POP_BLOCK
 
         # Python 2.5+:
         #  call_stmt ::= expr POP_TOP
@@ -69,7 +69,6 @@ class Python24Parser(Python25Parser):
         super(Python24Parser, self).customize_grammar_rules(tokens, customize)
         if self.version == 2.4:
             self.check_reduce['nop_stmt'] = 'tokens'
-            self.check_reduce['try_except'] = 'tokens'
 
     def reduce_is_invalid(self, rule, ast, tokens, first, last):
         invalid = super(Python24Parser,
@@ -83,15 +82,6 @@ class Python24Parser(Python25Parser):
             l = len(tokens)
             if 0 <= l < len(tokens):
                 return not int(tokens[first].pattr) == tokens[last].offset
-        elif lhs == 'try_except':
-            if last == len(tokens):
-                last -= 1
-            if tokens[last] != 'COME_FROM' and tokens[last-1] == 'COME_FROM':
-                last -= 1
-            return (tokens[last] == 'COME_FROM'
-                    and tokens[last-1] == 'END_FINALLY'
-                    and tokens[last-2] == 'POP_TOP'
-                    and tokens[last-3].kind != 'JUMP_FORWARD')
 
         return False
 

uncompyle6/parsers/parse25.py

@@ -89,15 +89,16 @@ class Python25Parser(Python26Parser):
         """)
         super(Python25Parser, self).customize_grammar_rules(tokens, customize)
         if self.version == 2.5:
-            self.check_reduce['tryelsestmt'] = 'tokens'
+            self.check_reduce['try_except'] = 'tokens'
 
-    def reduce_is_invalid(self, rule, ast, tokens, first, last):
-        invalid = super(Python25Parser,
-                        self).reduce_is_invalid(rule, ast,
-                                                tokens, first, last)
-        if invalid:
-            return invalid
-        return False
+    ## Don't need this for 2.5 yet..
+    # def reduce_is_invalid(self, rule, ast, tokens, first, last):
+    #     invalid = super(Python25Parser,
+    #                     self).reduce_is_invalid(rule, ast,
+    #                                             tokens, first, last)
+    #     if invalid or tokens is None:
+    #         return invalid
+    #     return False
 
 
 class Python25ParserSingle(Python26Parser, PythonParserSingle):