Skip to content

Commit

Permalink
Clean up init file and bump release
Browse files Browse the repository at this point in the history
  • Loading branch information
blink1073 committed Dec 26, 2016
1 parent 57570ae commit 45bd121
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 22 deletions.
6 changes: 6 additions & 0 deletions HISTORY.rst
Expand Up @@ -3,6 +3,12 @@
Release History
---------------

3.8.0 (2016-12-25)
++++++++++++++++++
- Add support for Octave class objects and clean up repr() and help()
for dynamic Octave methods, (PR #104)


3.7.0 (2016-12-24)
++++++++++++++++++
- Fixed error that caused the session to crash on Windows when Octave
Expand Down
23 changes: 1 addition & 22 deletions oct2py/__init__.py
Expand Up @@ -19,7 +19,7 @@
"""

__title__ = 'oct2py'
__version__ = '3.7.0'
__version__ = '3.8.0'
__author__ = 'Steven Silvester'
__license__ = 'MIT'
__copyright__ = 'Copyright 2014-2016 Steven Silvester'
Expand All @@ -37,27 +37,6 @@
except ImportError:
import _thread as thread


if os.name == 'nt':
"""
Allow Windows to intecept KeyboardInterrupt
http://stackoverflow.com/questions/15457786/ctrl-c-crashes-python-after-importing-scipy-stats
"""
basepath = imp.find_module('numpy')[1]
try:
lib1 = ctypes.CDLL(os.path.join(basepath, 'core', 'libmmd.dll'))
lib2 = ctypes.CDLL(os.path.join(basepath, 'core', 'libifcoremd.dll'))

def handler(sig, hook=thread.interrupt_main):
hook()
return 1

routine = ctypes.WINFUNCTYPE(ctypes.c_int, ctypes.c_uint)(handler)
ctypes.windll.kernel32.SetConsoleCtrlHandler(routine, 1)
except Exception:
pass


from .core import Oct2Py, Oct2PyError
from .utils import Struct, get_log
from .demo import demo
Expand Down

0 comments on commit 45bd121

Please sign in to comment.