Skip to content

Commit 9fd3221

Browse files
author
4b796c65
committed
Had to clean up lots of old junk changes, new changes include the OS event hang fix.
1 parent 62860c3 commit 9fd3221

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

CHANGELOG.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
===========
2+
Changelog
3+
===========
4+
Current
5+
* Noise generator now seeds properly
6+
* The OS event queue will now be handled during a call to tdl.flush
7+
This will prevent common lock-ups where events are handled infrequently
8+
19
1.1.6
210
* Fixed a race condition when importing on some platforms
311
* Fixed a type issue with quickFOV on Linux

README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ You can find more about libtcod at: http://doryen.eptalys.net/libtcod/
2626
License
2727
=========
2828
python-tdl is distributed under the FreeBSD license, same as libtcod.
29-
Read LICENSE.txt for more details.
29+
Read LICENSE.txt for more details.

dev/runRegressionTest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def randomizeConsole(self):
5252

5353
def flush(self):
5454
'Pump events and refresh screen so show progress'
55-
tdl.event.get()
55+
#tdl.event.get() # no longer needed
5656
tdl.flush()
5757

5858
def getRandomCharacter(self):

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python2
22

33
import subprocess
44

@@ -38,13 +38,13 @@ def get_version():
3838
author='Kyle Stewart',
3939
author_email='4B796C65+pythonTDL@gmail.com',
4040
description='Pythonic port of rogue-like library libtcod.',
41-
long_description=open('README.txt', 'r').read(),
41+
long_description=open('README.txt', 'r').read() + open('CHANGELOG.txt', 'r').read(),
4242
url='http://code.google.com/p/python-tdl/',
4343
download_url='https://pypi.python.org/pypi/tdl',
4444
packages=['tdl'],
4545
package_data={'tdl': ['*.txt', 'lib/*.txt', '*.bmp', '*.png', 'lib/win32/*',
4646
'lib/darwin/*.dylib', 'lib/linux*/*']},
47-
install_requires=['ctypes'],
47+
#install_requires=['ctypes'], # ctypes requirement causes issues sometimes
4848
classifiers=['Development Status :: 5 - Production/Stable',
4949
'Environment :: Win32 (MS Windows)',
5050
'Environment :: MacOS X',

tdl/VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.6r81
1+
1.1.6r84

tdl/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,8 @@ def flush():
11091109
"""
11101110
if not _rootinitialized:
11111111
raise TDLError('Cannot flush without first initializing with tdl.init')
1112-
1112+
# flush the OS event queue, preventing lock-ups if not done manually
1113+
event.get()
11131114
_lib.TCOD_console_flush()
11141115

11151116
def setFont(path, columns=None, rows=None, columnFirst=False,

0 commit comments

Comments
 (0)