Merge branch 'master' of github.com:eliben/pycparser

eliben · Jul 25, 2018 · ccd673e · ccd673e
2 parents 92f65b6 + a301cbb
commit ccd673e
Show file tree

Hide file tree

Showing 32 changed files with 101 additions and 98 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,6 @@
 language: python
 python:
   - "2.7"
-  - "3.2"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"

diff --git a/README.rst b/README.rst
@@ -2,7 +2,7 @@
 pycparser v2.18
 ===============
 
-:Author: `Eli Bendersky <http://eli.thegreenplace.net>`_
+:Author: `Eli Bendersky <https://eli.thegreenplace.net/>`_
 
 
 .. contents::
@@ -79,7 +79,7 @@ Installing
 Prerequisites
 -------------
 
-* **pycparser** was tested on Python 2.7, 3.3-3.6, on both Linux and
+* **pycparser** was tested on Python 2.7, 3.4-3.6, on both Linux and
   Windows. It should work on any later version (in both the 2.x and 3.x lines)
   as well.
 
@@ -158,7 +158,7 @@ the source is a previously defined type. This is essential in order to be able
 to parse C correctly.
 
 See `this blog post
-<http://eli.thegreenplace.net/2015/on-parsing-c-type-declarations-and-fake-headers>`_
+<https://eli.thegreenplace.net/2015/on-parsing-c-type-declarations-and-fake-headers>`_
 for more details.
 
 Basic usage

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,7 +2,6 @@ environment:
 
   matrix:
     - PYTHON: "C:\\Python27"
-    - PYTHON: "C:\\Python33"
     - PYTHON: "C:\\Python34"
     - PYTHON: "C:\\Python35"
     - PYTHON: "C:\\Python36"

diff --git a/examples/c-to-c.py b/examples/c-to-c.py
@@ -4,7 +4,7 @@
 # Example of using pycparser.c_generator, serving as a simplistic translator
 # from C to AST and back to C.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #------------------------------------------------------------------------------
 from __future__ import print_function

diff --git a/examples/cdecl.py b/examples/cdecl.py
@@ -29,7 +29,7 @@
 #   explain_c_declaration(c_decl, expand_struct=True)
 #   => p is a struct P containing {x is a int, y is a int}
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 import copy

diff --git a/examples/dump_ast.py b/examples/dump_ast.py
@@ -3,7 +3,7 @@
 #
 # Basic example of parsing a file and dumping its parsed AST.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 from __future__ import print_function

diff --git a/examples/explore_ast.py b/examples/explore_ast.py
@@ -9,7 +9,7 @@
 # information from the AST.
 # It helps to have the pycparser/_c_ast.cfg file in front of you.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 from __future__ import print_function

diff --git a/examples/func_calls.py b/examples/func_calls.py
@@ -4,7 +4,7 @@
 # Using pycparser for printing out all the calls of some function
 # in a C file.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 from __future__ import print_function

diff --git a/examples/func_defs.py b/examples/func_defs.py
@@ -7,7 +7,7 @@
 # This is a simple example of traversing the AST generated by
 # pycparser. Call it from the root directory of pycparser.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 from __future__ import print_function

diff --git a/examples/rewrite_ast.py b/examples/rewrite_ast.py
@@ -3,7 +3,7 @@
 #
 # Tiny example of rewriting a AST node
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 from __future__ import print_function

diff --git a/examples/serialize_ast.py b/examples/serialize_ast.py
@@ -4,7 +4,7 @@
 # Simple example of serializing AST
 #
 # Hart Chu [https://github.com/CtheSky]
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 from __future__ import print_function

diff --git a/examples/using_cpp_libc.py b/examples/using_cpp_libc.py
@@ -5,7 +5,7 @@
 # the 'real' cpp if you're on Linux/Unix) and "fake" libc includes
 # to parse a file that includes standard C headers.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 import sys

diff --git a/examples/using_gcc_E_libc.py b/examples/using_gcc_E_libc.py
@@ -5,7 +5,7 @@
 # of 'cpp'. The same can be achieved with Clang instead of gcc. If you have
 # Clang installed, simply replace 'gcc' with 'clang' here.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-------------------------------------------------------------------------------
 import sys

diff --git a/pycparser/__init__.py b/pycparser/__init__.py
@@ -4,12 +4,13 @@
 # This package file exports some convenience functions for
 # interacting with pycparser
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 __all__ = ['c_lexer', 'c_parser', 'c_ast']
 __version__ = '2.18'
 
+import io
 from subprocess import check_output
 from .c_parser import CParser
 
@@ -81,7 +82,7 @@ def parse_file(filename, use_cpp=False, cpp_path='cpp', cpp_args='',
     if use_cpp:
         text = preprocess_file(filename, cpp_path, cpp_args)
     else:
-        with open(filename, 'rU') as f:
+        with io.open(filename) as f:
             text = f.read()
 
     if parser is None:

diff --git a/pycparser/_ast_gen.py b/pycparser/_ast_gen.py
@@ -7,7 +7,7 @@
 # The design of this module was inspired by astgen.py from the
 # Python 2.5 code-base.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 import pprint
@@ -180,7 +180,7 @@ def _gen_attr_names(self):
 #
 # AST Node classes.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 

diff --git a/pycparser/_build_tables.py b/pycparser/_build_tables.py
@@ -6,7 +6,7 @@
 # Also generates AST code from the configuration file.
 # Should be called from the pycparser directory.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 

diff --git a/pycparser/_c_ast.cfg b/pycparser/_c_ast.cfg
@@ -9,7 +9,7 @@
 #   <name>**    - a sequence of child nodes
 #   <name>      - an attribute
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 

diff --git a/pycparser/ast_transforms.py b/pycparser/ast_transforms.py
@@ -3,7 +3,7 @@
 #
 # Some utilities used by the parser to create a friendlier AST.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #------------------------------------------------------------------------------
 

diff --git a/pycparser/c_ast.py b/pycparser/c_ast.py
@@ -11,7 +11,7 @@
 #
 # AST Node classes.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 

diff --git a/pycparser/c_generator.py b/pycparser/c_generator.py
@@ -3,7 +3,7 @@
 #
 # C code generator from pycparser AST nodes.
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #------------------------------------------------------------------------------
 from . import c_ast

diff --git a/pycparser/c_lexer.py b/pycparser/c_lexer.py
@@ -3,7 +3,7 @@
 #
 # CLexer class: lexer for the C language
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #------------------------------------------------------------------------------
 import re

diff --git a/pycparser/c_parser.py b/pycparser/c_parser.py
@@ -3,7 +3,7 @@
 #
 # CParser class: Parser and AST builder for the C language
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #------------------------------------------------------------------------------
 import re

diff --git a/pycparser/ply/cpp.py b/pycparser/ply/cpp.py
@@ -7,8 +7,6 @@
 #
 # This module implements an ANSI-C style lexical preprocessor for PLY.
 # -----------------------------------------------------------------------------
-from __future__ import generators
-
 import sys
 
 # Some Python 3 compatibility shims

diff --git a/pycparser/ply/yacc.py b/pycparser/ply/yacc.py
@@ -309,7 +309,7 @@ def restart(self):
     # certain kinds of advanced parsing situations where the lexer and parser interact with
     # each other or change states (i.e., manipulation of scope, lexer states, etc.).
     #
-    # See:  http://www.gnu.org/software/bison/manual/html_node/Default-Reductions.html#Default-Reductions
+    # See:  https://www.gnu.org/software/bison/manual/html_node/Default-Reductions.html#Default-Reductions
     def set_defaulted_states(self):
         self.defaulted_states = {}
         for state, actions in self.action.items():

diff --git a/pycparser/plyparser.py b/pycparser/plyparser.py
@@ -4,7 +4,7 @@
 # PLYParser class and other utilites for simplifying programming
 # parsers with PLY
 #
-# Eli Bendersky [http://eli.thegreenplace.net]
+# Eli Bendersky [https://eli.thegreenplace.net/]
 # License: BSD
 #-----------------------------------------------------------------
 

diff --git a/setup.py b/setup.py
@@ -55,12 +55,11 @@ def make_release_tree(self, basedir, files):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
     ],
+    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
     packages=['pycparser', 'pycparser.ply'],
     package_data={'pycparser': ['*.cfg']},
     cmdclass={'install': install, 'sdist': sdist},

diff --git a/tests/test_c_ast.py b/tests/test_c_ast.py
@@ -16,11 +16,11 @@ def test_BinaryOp(self):
             left=c_ast.Constant(type='int', value='6'),
             right=c_ast.ID(name='joe'))
 
-        self.failUnless(isinstance(b1.left, c_ast.Constant))
+        self.assertIsInstance(b1.left, c_ast.Constant)
         self.assertEqual(b1.left.type, 'int')
         self.assertEqual(b1.left.value, '6')
 
-        self.failUnless(isinstance(b1.right, c_ast.ID))
+        self.assertIsInstance(b1.right, c_ast.ID)
         self.assertEqual(b1.right.name, 'joe')
 
     def test_weakref_works_on_nodes(self):