Merge branch 'hotfix/v1.8.4'

Author: iMichka

.travis.yml

@@ -173,14 +173,14 @@ script:
   # Modify sitecustomize.py file for coverage. Allows to cover files run in a subprocess.
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then touch "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/lib/python${TRAVIS_PYTHON_VERSION}/sitecustomize.py"; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 2 ]]; then touch "/usr/local/lib/python2.7/site-packages/sitecustomize.py"; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 3 ]]; then touch "/usr/local/lib/python3.5/site-packages/sitecustomize.py"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 3 ]]; then touch "/usr/local/lib/python3.6/site-packages/sitecustomize.py"; fi
 
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]];
     then printf "import coverage\ncoverage.process_startup()\n" > "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/lib/python${TRAVIS_PYTHON_VERSION}/sitecustomize.py"; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 2 ]];
     then printf "import coverage\ncoverage.process_startup()\n" > "/usr/local/lib/python2.7/site-packages/sitecustomize.py"; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 3 ]];
-    then printf "import coverage\ncoverage.process_startup()\n" > "/usr/local/lib/python3.5/site-packages/sitecustomize.py"; fi
+    then printf "import coverage\ncoverage.process_startup()\n" > "/usr/local/lib/python3.6/site-packages/sitecustomize.py"; fi
 
   # Install pygccxml
   - python setup.py install

CHANGELOG.md

@@ -1,6 +1,25 @@
 Changes
 =======
 
+Version 1.8.4
+-------------
+
+1. Include paths read from configuration files on windows are now normed
+   and passed between quotation marks. This makes ```pygccxml``` more robust
+   when used on Windows (with paths containing whitespaces).
+
+2. Closed cache file handle, which would not be closed in case of an exception
+   (warning thrown by Python 2.7.13)
+
+3. Always call wait() on subprocesses before closing stdout/stderr streams.
+   Detected by Python 3.6. Fixes the following warning:
+   ResourceWarning: subprocess xxxxx is still running
+
+4. Fix deprecation warnings thrown by ```ConfigParser``` when using pygccxml
+   with python 2.7.13. Fix the usage of ```pygccxml``` with python 3.6.
+
+5. Updated travis setup to python 3.6 for OS X.
+
 Version 1.8.3
 -------------
 

pygccxml/__init__.py

@@ -40,4 +40,4 @@
 # TODO:
 # 1. Add "explicit" property for constructors
 
-__version__ = '1.8.3'
+__version__ = '1.8.4'

pygccxml/parser/config.py

@@ -13,10 +13,15 @@
 import platform
 import subprocess
 import warnings
+# In py3, ConfigParser was renamed to the more-standard configparser.
+# But there's a py3 backport that installs "configparser" in py2, and I don't
+# want it because it has annoying deprecation warnings. So try the real py2
+# import first
+# Inspired by https://bitbucket.org/ned/coveragepy/commits/f8e9d62f1412
 try:
-    from configparser import ConfigParser
-except ImportError:
     from ConfigParser import SafeConfigParser as ConfigParser
+except ImportError:
+    from configparser import ConfigParser
 from .. import utils
 
 
@@ -397,7 +402,7 @@ def load_xml_generator_configuration(configuration, **defaults):
             for p in value.split(';'):
                 p = p.strip()
                 if p:
-                    cfg.include_paths.append(p)
+                    cfg.include_paths.append(os.path.normpath(p))
         elif name == 'compiler':
             cfg.compiler = value
         elif name == 'xml_generator':
@@ -443,6 +448,7 @@ def create_compiler_path(xml_generator, compiler_path):
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE)
             compiler_path = p.stdout.read().decode("utf-8").rstrip()
+            p.wait()
             p.stdout.close()
             p.stderr.close()
             # No mscv found; look for mingw
@@ -452,6 +458,7 @@ def create_compiler_path(xml_generator, compiler_path):
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE)
                 compiler_path = p.stdout.read().decode("utf-8").rstrip()
+                p.wait()
                 p.stdout.close()
                 p.stderr.close()
         else:
@@ -462,6 +469,7 @@ def create_compiler_path(xml_generator, compiler_path):
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE)
             compiler_path = p.stdout.read().decode("utf-8").rstrip()
+            p.wait()
             p.stdout.close()
             p.stderr.close()
             # No clang found; use gcc
@@ -471,6 +479,7 @@ def create_compiler_path(xml_generator, compiler_path):
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE)
                 compiler_path = p.stdout.read().decode("utf-8").rstrip()
+                p.wait()
                 p.stdout.close()
                 p.stderr.close()
 

pygccxml/parser/declarations_cache.py

@@ -220,14 +220,16 @@ def __load(file_name):
                                       % (file_name, len(list(cache.keys()))))
         except Exception as error:
             file_cache_t.logger.exception(
-                "Error occured while reading cache file: %s",
+                "Error occurred while reading cache file: %s",
                 error)
             cache_file_obj.close()
             file_cache_t.logger.info(
                 "Invalid cache file: [%s]  Regenerating." %
                 file_name)
             open(file_name, 'w+b').close()   # Create empty file
             cache = {}                       # Empty cache
+        finally:
+            cache_file_obj.close()
         return cache
 
     def flush(self):

pygccxml/parser/source_reader.py

@@ -122,6 +122,7 @@ def __create_command_line(self, source_file, xml_file):
                                  stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE)
             help = p.stdout.read().decode("utf-8")
+            p.wait()
             p.stdout.close()
             p.stderr.close()
             if "CastXML wrapper" in help:
@@ -155,7 +156,7 @@ def __create_command_line_castxml(self, source_file, xmlfile):
 
         # Add additional includes directories
         dirs = self.__search_directories
-        cmd.append(''.join([' -I%s' % search_dir for search_dir in dirs]))
+        cmd.append(''.join([' -I"%s"' % search_dir for search_dir in dirs]))
 
         # Clang option: -c Only run preprocess, compile, and assemble steps
         cmd.append("-c")
@@ -349,6 +350,7 @@ def create_xml_file(self, source_file, destination=None):
             utils.remove_file_no_raise(xml_file, self.__config)
             raise
         finally:
+            process.wait()
             process.stdout.close()
         return xml_file
 

pygccxml/utils/utils.py

@@ -53,19 +53,22 @@ def find_xml_generator(name=None):
         p = subprocess.Popen([command, name], stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
         path = p.stdout.read().decode("utf-8")
+        p.wait()
         p.stdout.close()
         p.stderr.close()
         if path == "":
             name = "gccxml"
             p = subprocess.Popen([command, name], stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE)
             path = p.stdout.read().decode("utf-8")
+            p.wait()
             p.stdout.close()
             p.stderr.close()
     else:
         p = subprocess.Popen([command, name], stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
         path = p.stdout.read().decode("utf-8")
+        p.wait()
         p.stdout.close()
         p.stderr.close()
     if path == "":

unittests/file_cache_tester.py

@@ -101,6 +101,7 @@ def test_reopen_cache():
             stdout=subprocess.PIPE,
             env=env)
         print(p.stdout.read())
+        p.wait()
         p.stdout.close()