diff --git a/pyoblige/__init__.py b/pyoblige/__init__.py index 79f4d2f..9dc5751 100644 --- a/pyoblige/__init__.py +++ b/pyoblige/__init__.py @@ -1,3 +1,3 @@ -__version__ = "0.1.1" +__version__ = "0.1.3" from .oblige import * from .wad_configs import * \ No newline at end of file diff --git a/pyoblige/oblige.py b/pyoblige/oblige.py index 13954ca..0b79b2c 100644 --- a/pyoblige/oblige.py +++ b/pyoblige/oblige.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - from __future__ import print_function import os import sys @@ -339,11 +337,11 @@ def generate(self, wad_path, verbose=False): raise Exception("Oblige does not exists! Package is incomplete!") if verbose: - print("Config text file path: {}" - "\nOutput wad file path: {}" - "\nOblige executable path: {}".format(config_path, wad_path, oblige_path)) + print('Config text file path: "{}"' + '\nOutput wad file path: "{}"' + '\nOblige executable path: "{}"'.format(config_path, wad_path, oblige_path)) - cmd = "{} --batch {} --load {} --keep".format(oblige_exe, wad_path, config_path) + cmd = '"{}" --batch "{}" --load "{}" --keep'.format(oblige_exe, wad_path, config_path) if verbose: cmd += " --verbose" @@ -355,12 +353,13 @@ def generate(self, wad_path, verbose=False): exit_code = oblige_process.returncode except subprocess.CalledProcessError: - raise Exception("Oblige failed to generate .wad file!\nExit code: {}\nLog:\n{}" - .format(exit_code, results)) + raise Exception("Oblige failed to generate .wad file!" + "\nExit code: {}" + "\nLog:\n{}".format(exit_code, results)) if verbose: - print("Exit code: {}\n" - "Oblige output:\n{}".format(exit_code, results)) + print("Exit code: {}" + "\nOblige output:\n{}".format(exit_code, results)) # Parse results maps = 1 diff --git a/pyoblige/wad_configs.py b/pyoblige/wad_configs.py index 7f87180..a8a237c 100644 --- a/pyoblige/wad_configs.py +++ b/pyoblige/wad_configs.py @@ -1,4 +1,3 @@ - test_wad = { "theme": "bit_mixed", "size": "micro", diff --git a/setup.py b/setup.py index 17c2996..3ac3010 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ def run(self): setup( name='oblige', - version='0.1.2', + version='0.1.3', description='Level generator for DOOM', long_description="Level generator for DOOM. Wrapper for Oblige.", url='https://github.com/mwydmuch/PyOblige',