Merge pull request #91 from mjdorma/1.3.0b1

1.3.0b1

Author: SethMichaelLarson

.gitignore

@@ -101,3 +101,4 @@ ENV/
 *.swp
 *.zip
 *.xidl
+*.kmk

.travis.yml

@@ -17,6 +17,13 @@ matrix:
     - python: 3.6
       env: TOXENV=packaging
 
+    # Building Library.py
+    - python: 2.7
+      env: TOXENV=build
+
+    - python: 3.6
+      env: TOXENV=build
+
 cache:
   - pip
   - directories:

CHANGES.rst

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+version 1.3.0b1
+
+* Added ``SettingsVersion.v1_17`` which is written by VirtualBox 5.2.x
+* Added ``VirtualBox.create_unattended_installer()``
+* Added ``IUnattended`` interface which can be used to create a Guest OS
+  in a fully automated way. (Doesn't work yet in 5.2 beta)
+* Added ``IHostNetworkInterface.wireless`` property which returns
+  ``True`` if the interface is wireless.
+
 version 1.2.0 (28/08/2017)
 
 * Searches for vboxapi installed in Anaconda on Windows. (@SethMichaelLarson PR #80)

build.py

@@ -6,12 +6,10 @@
 
 """
 from xml.dom import minidom
-import pprint
-import sys
 import os
 import re
 import hashlib
-import urllib2
+import requests
 import shutil
 import begin
 
@@ -24,11 +22,17 @@
 def pythonic_name(name):
     s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', name)
     name = re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1).lower()
-    if hasattr(builtin, name) is True or name in ['global']:
+    if hasattr(builtin, name) is True or name in ['global', 'file', 'apply']:
         name += "_p"
     return name
 
 
+def to_string(value):
+    if isinstance(value, str):
+        return value
+    return value.decode('utf-8')
+
+
 LIB_IMPORTS = """\
 # A Pythonic VirtalBox Main API
 #
@@ -621,18 +625,18 @@ def preprocess(xidl, target):
     emit = True
     for line in xidl.splitlines():
         line = line.strip()
-        if line.startswith('<if target='):
+        if line.startswith(b'<if target='):
             if target in line:
                 emit = True
             else:
                 emit = False
             continue
-        elif line == '</if>':
+        elif line == b'</if>':
             emit = True
             continue
         if emit:
             lines.append(line)
-    return "\n".join(lines)
+    return b"\n".join(lines)
 
 
 ###########################################################
@@ -645,13 +649,13 @@ def get_vbox_version(config_kmk):
     "Return the vbox config major, minor, build"
     with open(config_kmk, 'rb') as f:
         config = f.read()
-    major = re.search("VBOX_VERSION_MAJOR = (?P<major>[\d])", 
+    major = re.search(b"VBOX_VERSION_MAJOR = (?P<major>[\d])",
                       config).groupdict()['major']
-    minor = re.search("VBOX_VERSION_MINOR = (?P<minor>[\d])", 
+    minor = re.search(b"VBOX_VERSION_MINOR = (?P<minor>[\d])",
                       config).groupdict()['minor']
-    build = re.search("VBOX_VERSION_BUILD = (?P<build>[\d])", 
+    build = re.search(b"VBOX_VERSION_BUILD = (?P<build>[\d])",
                       config).groupdict()['build']
-    return ".".join([major, minor, build])
+    return b".".join([major, minor, build])
 
 def download_master(downloads):
     print("Download the master xidl")
@@ -663,11 +667,11 @@ def download_master(downloads):
 
 def download_stable(downloads):
     print("Download latest tarball for stable release then unpack xidl")
-    url = urllib2.urlopen('https://www.virtualbox.org/wiki/Downloads')
-    page = url.read()
+    with requests.get('https://www.virtualbox.org/wiki/Downloads') as r:
+        page = r.content
+
     match = re.search("http://download.virtualbox.org/virtualbox/"
-                      "([0-9\.]+)/VirtualBox-([0-9\.]+).tar.bz2"
-                      , page)
+                      "([0-9\.]+)/VirtualBox-([0-9\.]+).tar.bz2", page)
     if not match:
         raise Exception("Failed to find source tarball url")
     sourceurl = page[match.start():match.end()]
@@ -710,7 +714,7 @@ def main(virtualbox_xidl='VirtualBox.xidl',
 
     print("Create new virtualbox/library.py")
     xidl = open(virtualbox_xidl, 'rb').read()
-    xidl = preprocess(xidl, target='xpidl')
+    xidl = preprocess(xidl, target=b'xpidl')
 
     xml = minidom.parseString(xidl)
 
@@ -764,11 +768,11 @@ def main(virtualbox_xidl='VirtualBox.xidl',
     uuid = library.getAttribute('uuid')
     version = library.getAttribute('version')
     xidl_hash = hashlib.md5(xidl).hexdigest()
-    lib_meta = LIB_META % dict(vbox_version=vbox_version,
-                               uuid=uuid,
-                               version=version, 
-                               app_uuid=app_uuid,
-                               xidl_hash=xidl_hash)
+    lib_meta = LIB_META % dict(vbox_version=to_string(vbox_version),
+                               uuid=to_string(uuid),
+                               version=to_string(version),
+                               app_uuid=to_string(app_uuid),
+                               xidl_hash=to_string(xidl_hash))
 
     code = []
     code.append(LIB_IMPORTS)
@@ -778,14 +782,14 @@ def main(virtualbox_xidl='VirtualBox.xidl',
     code.extend(source['result'])
     code.extend(source['enum'])
     code.extend(source['interface'])
-    code = "\n".join(code)
-    print("   vbox version : %s" % vbox_version)
+    code = b"\n".join([c.encode('utf-8') if not isinstance(c, bytes) else c for c in code])
+    print("   vbox version : %s" % to_string(vbox_version))
     print("   xidl hash    : %s" % xidl_hash)
     print("   version      : %s" % version) 
-    print("   line count   : %s" % code.count("\n"))
+    print("   line count   : %s" % code.count(b"\n"))
     library_path = os.path.join('.', 'virtualbox', 'library.py')
     if os.path.exists(library_path):
         os.unlink(library_path)
-    with open(library_path, 'w') as f:
+    with open(library_path, 'wb') as f:
         f.write(code)
 

dev-requirements.txt

@@ -1,3 +1,6 @@
 tox==2.7.0
 flake8==3.3.0
 Sphinx==1.6.1
+requests==2.18.3
+begins
+funconf

setup.py

@@ -12,29 +12,23 @@
 tests_require = ['begins', 'funconf']
 
 
-def load_version(filename='./virtualbox/version.py'):
-    """Parse a __version__ number from a source file"""
-    with open(filename) as source:
-        text = source.read()
-        match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", text)
-        if not match:
-            msg = "Unable to find version number in {}".format(filename)
-            raise RuntimeError(msg)
-        version = match.group(1)
-        return version
+base_dir = os.path.dirname(os.path.abspath(__file__))
+about = {}
+with open(os.path.join(base_dir, 'virtualbox', '__about__.py')) as f:
+    exec(f.read(), about)
 
 
 setup(
-    name="pyvbox",
-    version=load_version(),
+    name=about['__name__'],
+    version=about['__version__'],
     packages=["virtualbox",
               "virtualbox.library_ext"],
-    author="Michael Dorman",
-    author_email="mjdorma+pyvbox@gmail.com",
-    url="https://github.com/mjdorma/pyvbox",
+    author=about['__author__'],
+    author_email=about['__email__'],
+    url=about['__url__'],
     description="A complete VirtualBox Main API implementation",
     long_description=open('README.rst').read(),
-    license="Apache-2.0",
+    license=about['__license__'],
     zip_safe=False,
     install_requires=install_requires,
     platforms=['cygwin', 'win', 'linux'],

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = lint, docs, packaging
+envlist = lint, docs, packaging, build
 
 [testenv:lint]
 commands =
@@ -16,3 +16,8 @@ commands =
     python -m pip install readme_renderer check-manifest
     check-manifest --ignore *.yml,.github*
     python setup.py check --metadata --restructuredtext --strict
+
+[testenv:build]
+commands =
+    python -m pip install -r dev-requirements.txt
+    python build.py --build-against-master --force-download

virtualbox/__about__.py

@@ -0,0 +1,6 @@
+__name__ = 'pyvbox'
+__author__ = 'Michael Dorman'
+__email__ = 'mjdorma+pyvbox@gmail.com'
+__version__ = '1.3.0b1'
+__license__ = 'Apache-2.0'
+__url__ = 'https://github.com/mjdorma/pyvbox'

virtualbox/__init__.py

@@ -24,6 +24,12 @@
 from multiprocessing import current_process
 
 from virtualbox.library_ext import library
+from .__about__ import (__name__,  # noqa: F401
+                        __version__,
+                        __author__,
+                        __email__,
+                        __license__,
+                        __url__)
 
 
 # Adopt on the library API root documentation
@@ -238,5 +244,3 @@ def __init__(self, url='http://localhost/', user='', password=''):
 # Lazy include...
 from virtualbox import pool  # noqa: F401
 from virtualbox import events  # noqa: F401
-from virtualbox import version  # noqa: F401
-from virtualbox.version import __version__  # noqa: F401