Hello community, here is the log from the commit of package python-colorama for openSUSE:Factory checked in at 2013-09-27 17:59:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-colorama (Old) and /work/SRC/openSUSE:Factory/.python-colorama.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-colorama" Changes: -------- --- /work/SRC/openSUSE:Factory/python-colorama/python-colorama.changes 2013-05-02 11:37:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-colorama.new/python-colorama.changes 2013-09-27 17:59:57.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 26 13:35:10 UTC 2013 - [email protected] + +- update to 0.2.7: + * Fix problem under 64-bit windows due to ctypes HANDLE size. + * Fix licensing to the source files + +------------------------------------------------------------------- Old: ---- colorama-0.2.5.tar.gz New: ---- colorama-0.2.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-colorama.spec ++++++ --- /var/tmp/diff_new_pack.OD6Q6l/_old 2013-09-27 17:59:57.000000000 +0200 +++ /var/tmp/diff_new_pack.OD6Q6l/_new 2013-09-27 17:59:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-colorama -Version: 0.2.5 +Version: 0.2.7 Release: 0 Summary: Cross-platform colored terminal text License: BSD-3-Clause @@ -49,7 +49,6 @@ %prep %setup -q -n colorama-%{version} -sed -i "s/\r//" README.txt LICENSE.txt demos/demo0{6,7}.py demos/demo.bat %build python setup.py build ++++++ colorama-0.2.5.tar.gz -> colorama-0.2.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/CHANGELOG.rst new/colorama-0.2.7/CHANGELOG.rst --- old/colorama-0.2.5/CHANGELOG.rst 2011-06-25 11:59:44.000000000 +0200 +++ new/colorama-0.2.7/CHANGELOG.rst 2013-09-26 11:55:45.000000000 +0200 @@ -1,79 +1,93 @@ -0.2.3 - Split changelog out into separate file. -0.2.2 - Fix bug which caused init() to raise, introduced in 0.2.1. - Remove asserts which cause problems in various circumstances. At least - some users saw asserts fail on 'success' returned from win32 functions, - even though the win32 functions appear to have worked correctly. -0.2.1 - Completely broken: I added a bug which caused init() to raise. - Added some documentation for cursor positioning and clear screen to README. - Add 'reinit' and 'deinit' functions, as suggested by Charles FOL and - Romanov DA. -0.2 - Merge in changes from Daniel Griffith: Add ANSI cursor positioning & - partial support for clear screen. Patch submitted by Oscar Lester, don't - send RESET_ALL to non-tty. Demos split into separate files and moved into - their own directory. Tweak sys.path in demos so they run against local - source, not installed version of Colorama. -0.1.18 - Fix README (no such attr as Fore.DEFAULT, etc), kindly reported by nodakai. -0.1.17 - Prevent printing of garbage ANSI codes upon installing with pip -0.1.16 - Re-upload to fix previous error. Make clean now removes old MANIFEST. -0.1.15 - Completely broken. Distribution was empty due to leftover invalid MANIFEST - file from building on a different platform. - Fix python3 incompatibility kindly reported by G |uumlaut| nter Kolousek -0.1.14 - Fix hard-coded reset to white-on-black colors. Fore.RESET, Back.RESET - and Style.RESET_ALL now revert to the colors as they were when init() - was called. Some lessons hopefully learned about testing prior to release. -0.1.13 - Completely broken: barfed when installed using pip. -0.1.12 - Completely broken: contained no source code. double oops. -0.1.11 - Completely broken: fatal import errors on Ubuntu. oops. -0.1.10 - Stop emulating 'bright' text with bright backgrounds. - Display 'normal' text using win32 normal foreground instead of bright. - Drop support for 'dim' text. -0.1.9 - Fix incompatibility with Python 2.5 and earlier. - Remove setup.py dependency on setuptools, now uses stdlib distutils. -0.1.8 - Fix ghastly errors all over the place on Ubuntu. - Add init kwargs 'convert' and 'strip', which supercede the old 'wrap'. -0.1.7 - Python 3 compatible. - Fix: Now strips ansi on windows without necessarily converting it to - win32 calls (eg. if output is not a tty.) - Fix: Flaky interaction of interleaved ansi sent to stdout and stderr. - Improved demo.sh (hg checkout only.) -0.1.6 - Fix ansi sequences with no params now default to parmlist of [0]. - Fix flaky behaviour of autoreset and reset_all atexit. - Fix stacking of repeated atexit calls - now just called once. - Fix ghastly import problems while running tests. - 'demo.py' (hg checkout only) now demonstrates autoreset and reset atexit. - Provide colorama.VERSION, used by setup.py. - Tests defanged so they no longer actually change terminal color when run. -0.1.5 - Now works on Ubuntu. -0.1.4 - Implemented RESET_ALL on application exit -0.1.3 - Implemented init(wrap=False) -0.1.2 - Implemented init(autoreset=True) -0.1.1 - Minor tidy -0.1 - Works on Windows for foreground color, background color, bright or dim - - -.. |uumlaut| unicode:: U+00FC .. u with umlaut - :trim: - +0.2.7 + Fix problem under 64-bit windows due to ctypes HANDLE size. + Submitted by the rather magnificent Ben Hoyt. + This fixes issue 43 (http://code.google.com/p/colorama/issues/detail?id=43) +0.2.6 + Add copyright & licensing info to every file, as requested by a large + downstream project which has problems making sure that all 3rd party + contributions have appropriate license. +0.2.5 + Severeral documentation & demo fixes. +0.2.4 + Fix to work on Windows 7. + Python 3 compatibility in docs and demos. + Add handling for 'cursor up' and 'get position' ANSI codes. +0.2.3 + Split changelog out into separate file. +0.2.2 + Fix bug which caused init() to raise, introduced in 0.2.1. + Remove asserts which cause problems in various circumstances. At least + some users saw asserts fail on 'success' returned from win32 functions, + even though the win32 functions appear to have worked correctly. +0.2.1 + Completely broken: I added a bug which caused init() to raise. + Added some documentation for cursor positioning and clear screen to README. + Add 'reinit' and 'deinit' functions, as suggested by Charles FOL and + Romanov DA. +0.2 + Merge in changes from Daniel Griffith: Add ANSI cursor positioning & + partial support for clear screen. Patch submitted by Oscar Lester, don't + send RESET_ALL to non-tty. Demos split into separate files and moved into + their own directory. Tweak sys.path in demos so they run against local + source, not installed version of Colorama. +0.1.18 + Fix README (no such attr as Fore.DEFAULT, etc), kindly reported by nodakai. +0.1.17 + Prevent printing of garbage ANSI codes upon installing with pip +0.1.16 + Re-upload to fix previous error. Make clean now removes old MANIFEST. +0.1.15 + Completely broken. Distribution was empty due to leftover invalid MANIFEST + file from building on a different platform. + Fix python3 incompatibility kindly reported by G |uumlaut| nter Kolousek +0.1.14 + Fix hard-coded reset to white-on-black colors. Fore.RESET, Back.RESET + and Style.RESET_ALL now revert to the colors as they were when init() + was called. Some lessons hopefully learned about testing prior to release. +0.1.13 + Completely broken: barfed when installed using pip. +0.1.12 + Completely broken: contained no source code. double oops. +0.1.11 + Completely broken: fatal import errors on Ubuntu. oops. +0.1.10 + Stop emulating 'bright' text with bright backgrounds. + Display 'normal' text using win32 normal foreground instead of bright. + Drop support for 'dim' text. +0.1.9 + Fix incompatibility with Python 2.5 and earlier. + Remove setup.py dependency on setuptools, now uses stdlib distutils. +0.1.8 + Fix ghastly errors all over the place on Ubuntu. + Add init kwargs 'convert' and 'strip', which supercede the old 'wrap'. +0.1.7 + Python 3 compatible. + Fix: Now strips ansi on windows without necessarily converting it to + win32 calls (eg. if output is not a tty.) + Fix: Flaky interaction of interleaved ansi sent to stdout and stderr. + Improved demo.sh (hg checkout only.) +0.1.6 + Fix ansi sequences with no params now default to parmlist of [0]. + Fix flaky behaviour of autoreset and reset_all atexit. + Fix stacking of repeated atexit calls - now just called once. + Fix ghastly import problems while running tests. + 'demo.py' (hg checkout only) now demonstrates autoreset and reset atexit. + Provide colorama.VERSION, used by setup.py. + Tests defanged so they no longer actually change terminal color when run. +0.1.5 + Now works on Ubuntu. +0.1.4 + Implemented RESET_ALL on application exit +0.1.3 + Implemented init(wrap=False) +0.1.2 + Implemented init(autoreset=True) +0.1.1 + Minor tidy +0.1 + Works on Windows for foreground color, background color, bright or dim + + +.. |uumlaut| unicode:: U+00FC .. u with umlaut + :trim: + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/LICENSE.txt new/colorama-0.2.7/LICENSE.txt --- old/colorama-0.2.5/LICENSE.txt 2010-04-30 19:35:42.000000000 +0200 +++ new/colorama-0.2.7/LICENSE.txt 2013-09-21 11:26:18.000000000 +0200 @@ -1,9 +1,4 @@ -Copyright (c) 2010 Jonathan Hartley <[email protected]> - -Released under the New BSD license (reproduced below), or alternatively you may -use this software under any OSI approved open source license such as those at -http://opensource.org/licenses/alphabetical - +Copyright (c) 2010 Jonathan Hartley All rights reserved. Redistribution and use in source and binary forms, with or without @@ -16,7 +11,7 @@ this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name(s) of the copyright holders, nor those of its contributors +* Neither the name of the copyright holders, nor those of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/PKG-INFO new/colorama-0.2.7/PKG-INFO --- old/colorama-0.2.5/PKG-INFO 2013-02-20 21:05:17.000000000 +0100 +++ new/colorama-0.2.7/PKG-INFO 2013-09-26 12:05:11.000000000 +0200 @@ -1,6 +1,6 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.0 Name: colorama -Version: 0.2.5 +Version: 0.2.7 Summary: Cross-platform colored terminal text. Home-page: http://code.google.com/p/colorama/ Author: Jonathan Hartley @@ -16,13 +16,18 @@ Description =========== - Makes ANSI escape character sequences, for producing colored terminal text and - cursor positioning, work under MS Windows. + Makes ANSI escape character sequences for producing colored terminal text and + cursor positioning work under MS Windows. ANSI escape character sequences have long been used to produce colored terminal text and cursor positioning on Unix and Macs. Colorama makes this work on - Windows, too. It also provides some shortcuts to help generate ANSI sequences, - and works fine in conjunction with any other ANSI sequence generation library, + Windows, too, by wrapping stdout, stripping ANSI sequences it finds (which + otherwise show up as gobbledygook in your output), and converting them into the + appropriate win32 calls to modify the state of the terminal. On other platforms, + Colorama does nothing. + + Colorama also provides some shortcuts to help generate ANSI sequences + but works fine in conjunction with any other ANSI sequence generation library, such as Termcolor (http://pypi.python.org/pypi/termcolor.) This has the upshot of providing a simple cross-platform API for printing @@ -31,6 +36,11 @@ Linux or Macs can now also work on Windows, simply by calling ``colorama.init()``. + An alternative approach is to install 'ansi.sys' on Windows machines, which + provides the same behaviour for all applications running in terminals. Colorama + is intended for situations where that isn't easy (e.g. maybe your app doesn't + have an installer.) + Demo scripts in the source code repository prints some colored text using ANSI sequences. Compare their output under Gnome-terminal's built in ANSI handling, versus on Windows Command-Prompt using Colorama: @@ -49,12 +59,17 @@ text': it looks the same as 'normal text'. + License + ======= + + Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. + + Dependencies ============ None, other than Python. Tested on Python 2.5.5, 2.6.5, 2.7, 3.1.2, and 3.2 - Usage ===== @@ -90,9 +105,9 @@ from colorama import Fore, Back, Style print(Fore.RED + 'some red text') - print(Back.GREEN + and with a green background') + print(Back.GREEN + 'and with a green background') print(Style.DIM + 'and in dim text') - print(+ Fore.RESET + Back.RESET + Style.RESET_ALL) + print(Fore.RESET + Back.RESET + Style.RESET_ALL) print('back to normal now') or simply by manually printing ANSI sequences from your own code:: @@ -170,16 +185,16 @@ stream = AnsiToWin32(sys.stderr).stream # Python 2 - print >>stream, Fore.BLUE + 'blue text on stderr' + print >>stream, Fore.BLUE + 'blue text on stderr' # Python 3 print(Fore.BLUE + 'blue text on stderr', file=stream) - + Status & Known Problems ======================= - I've personally only tested it on WinXP (CMD, Console2), Ubuntu + I've personally only tested it on WinXP (CMD, Console2), Ubuntu (gnome-terminal, xterm), and OSX. Some presumably valid ANSI sequences aren't recognised (see details below) @@ -201,7 +216,7 @@ ESC [ <param> ; <param> ... <command> - Where <param> is an integer, and <command> is a single letter. Zero or more + Where <param> is an integer, and <command> is a single letter. Zero or more params are passed to a <command>. If no params are passed, it is generally synonymous with passing a single zero. No spaces exist in the sequence, they have just been inserted here to make it easy to read. @@ -236,7 +251,7 @@ ESC [ 49 m # reset # cursor positioning - ESC [ x;y H # position cursor at x,y + ESC [ y;x H # position cursor at x across, y down # clear the screen ESC [ mode J # clear the screen. Only mode 2 (clear entire screen) @@ -260,6 +275,8 @@ Development =========== + Help and fixes welcome! Ask Jonathan for commit rights, you'll get them. + Running tests requires: - Michael Foord's 'mock' module to be installed. @@ -275,9 +292,19 @@ stdout, which confuses the unit tests. + Contact + ======= + + Created by Jonathan Hartley, [email protected] + + Thanks ====== - | User 'stuyck', for suggesting Python3 compatible updates to README. + | Ben Hoyt, for a magnificent fix under 64-bit Windows. + | Jesse@EmptySquare for submitting a fix for examples in the README. + | User 'jamessp', an observant documentation fix for cursor positioning. + | User 'vaal1239', Dave Mckee & Lackner Kristof for a tiny but much-needed Win7 fix. + | Julien Stuyck, for wisely suggesting Python3 compatible updates to README. | Daniel Griffith for multiple fabulous patches. | Oscar Lesta for valuable fix to stop ANSI chars being sent to non-tty output. | Roger Binns, for many suggestions, valuable feedback, & bug reports. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/README.txt new/colorama-0.2.7/README.txt --- old/colorama-0.2.5/README.txt 2013-02-20 20:48:18.000000000 +0100 +++ new/colorama-0.2.7/README.txt 2013-09-26 11:59:50.000000000 +0200 @@ -8,13 +8,18 @@ Description =========== -Makes ANSI escape character sequences, for producing colored terminal text and -cursor positioning, work under MS Windows. +Makes ANSI escape character sequences for producing colored terminal text and +cursor positioning work under MS Windows. ANSI escape character sequences have long been used to produce colored terminal text and cursor positioning on Unix and Macs. Colorama makes this work on -Windows, too. It also provides some shortcuts to help generate ANSI sequences, -and works fine in conjunction with any other ANSI sequence generation library, +Windows, too, by wrapping stdout, stripping ANSI sequences it finds (which +otherwise show up as gobbledygook in your output), and converting them into the +appropriate win32 calls to modify the state of the terminal. On other platforms, +Colorama does nothing. + +Colorama also provides some shortcuts to help generate ANSI sequences +but works fine in conjunction with any other ANSI sequence generation library, such as Termcolor (http://pypi.python.org/pypi/termcolor.) This has the upshot of providing a simple cross-platform API for printing @@ -23,6 +28,11 @@ Linux or Macs can now also work on Windows, simply by calling ``colorama.init()``. +An alternative approach is to install 'ansi.sys' on Windows machines, which +provides the same behaviour for all applications running in terminals. Colorama +is intended for situations where that isn't easy (e.g. maybe your app doesn't +have an installer.) + Demo scripts in the source code repository prints some colored text using ANSI sequences. Compare their output under Gnome-terminal's built in ANSI handling, versus on Windows Command-Prompt using Colorama: @@ -41,12 +51,17 @@ text': it looks the same as 'normal text'. +License +======= + +Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. + + Dependencies ============ None, other than Python. Tested on Python 2.5.5, 2.6.5, 2.7, 3.1.2, and 3.2 - Usage ===== @@ -82,9 +97,9 @@ from colorama import Fore, Back, Style print(Fore.RED + 'some red text') - print(Back.GREEN + and with a green background') + print(Back.GREEN + 'and with a green background') print(Style.DIM + 'and in dim text') - print(+ Fore.RESET + Back.RESET + Style.RESET_ALL) + print(Fore.RESET + Back.RESET + Style.RESET_ALL) print('back to normal now') or simply by manually printing ANSI sequences from your own code:: @@ -162,16 +177,16 @@ stream = AnsiToWin32(sys.stderr).stream # Python 2 - print >>stream, Fore.BLUE + 'blue text on stderr' + print >>stream, Fore.BLUE + 'blue text on stderr' # Python 3 print(Fore.BLUE + 'blue text on stderr', file=stream) - + Status & Known Problems ======================= -I've personally only tested it on WinXP (CMD, Console2), Ubuntu +I've personally only tested it on WinXP (CMD, Console2), Ubuntu (gnome-terminal, xterm), and OSX. Some presumably valid ANSI sequences aren't recognised (see details below) @@ -193,7 +208,7 @@ ESC [ <param> ; <param> ... <command> -Where <param> is an integer, and <command> is a single letter. Zero or more +Where <param> is an integer, and <command> is a single letter. Zero or more params are passed to a <command>. If no params are passed, it is generally synonymous with passing a single zero. No spaces exist in the sequence, they have just been inserted here to make it easy to read. @@ -228,7 +243,7 @@ ESC [ 49 m # reset # cursor positioning - ESC [ x;y H # position cursor at x,y + ESC [ y;x H # position cursor at x across, y down # clear the screen ESC [ mode J # clear the screen. Only mode 2 (clear entire screen) @@ -252,6 +267,8 @@ Development =========== +Help and fixes welcome! Ask Jonathan for commit rights, you'll get them. + Running tests requires: - Michael Foord's 'mock' module to be installed. @@ -267,9 +284,19 @@ stdout, which confuses the unit tests. +Contact +======= + +Created by Jonathan Hartley, [email protected] + + Thanks ====== -| User 'stuyck', for suggesting Python3 compatible updates to README. +| Ben Hoyt, for a magnificent fix under 64-bit Windows. +| Jesse@EmptySquare for submitting a fix for examples in the README. +| User 'jamessp', an observant documentation fix for cursor positioning. +| User 'vaal1239', Dave Mckee & Lackner Kristof for a tiny but much-needed Win7 fix. +| Julien Stuyck, for wisely suggesting Python3 compatible updates to README. | Daniel Griffith for multiple fabulous patches. | Oscar Lesta for valuable fix to stop ANSI chars being sent to non-tty output. | Roger Binns, for many suggestions, valuable feedback, & bug reports. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/colorama/__init__.py new/colorama-0.2.7/colorama/__init__.py --- old/colorama-0.2.5/colorama/__init__.py 2013-02-20 21:03:19.000000000 +0100 +++ new/colorama-0.2.7/colorama/__init__.py 2013-09-26 11:53:28.000000000 +0200 @@ -1,6 +1,7 @@ +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. from .initialise import init, deinit, reinit from .ansi import Fore, Back, Style from .ansitowin32 import AnsiToWin32 -VERSION = '0.2.5' +VERSION = '0.2.7' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/colorama/ansi.py new/colorama-0.2.7/colorama/ansi.py --- old/colorama-0.2.5/colorama/ansi.py 2010-05-17 12:43:00.000000000 +0200 +++ new/colorama-0.2.7/colorama/ansi.py 2013-09-20 17:03:01.000000000 +0200 @@ -1,3 +1,4 @@ +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. ''' This module generates ANSI character codes to printing colors to terminals. See: http://en.wikipedia.org/wiki/ANSI_escape_code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/colorama/ansitowin32.py new/colorama-0.2.7/colorama/ansitowin32.py --- old/colorama-0.2.5/colorama/ansitowin32.py 2011-10-15 22:48:48.000000000 +0200 +++ new/colorama-0.2.7/colorama/ansitowin32.py 2013-09-20 17:03:01.000000000 +0200 @@ -1,4 +1,4 @@ - +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. import re import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/colorama/initialise.py new/colorama-0.2.7/colorama/initialise.py --- old/colorama-0.2.5/colorama/initialise.py 2011-07-20 13:36:16.000000000 +0200 +++ new/colorama-0.2.7/colorama/initialise.py 2013-09-20 17:03:01.000000000 +0200 @@ -1,3 +1,4 @@ +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. import atexit import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/colorama/win32.py new/colorama-0.2.7/colorama/win32.py --- old/colorama-0.2.5/colorama/win32.py 2013-02-20 21:00:47.000000000 +0100 +++ new/colorama-0.2.7/colorama/win32.py 2013-09-26 11:53:11.000000000 +0200 @@ -1,109 +1,134 @@ - -# from winbase.h -STDOUT = -11 -STDERR = -12 - -try: - from ctypes import windll -except ImportError: - windll = None - SetConsoleTextAttribute = lambda *_: None -else: - from ctypes import ( - byref, Structure, c_char, c_short, c_uint32, c_ushort - ) - - handles = { - STDOUT: windll.kernel32.GetStdHandle(STDOUT), - STDERR: windll.kernel32.GetStdHandle(STDERR), - } - - SHORT = c_short - WORD = c_ushort - DWORD = c_uint32 - TCHAR = c_char - - class COORD(Structure): - """struct in wincon.h""" - _fields_ = [ - ('X', SHORT), - ('Y', SHORT), - ] - - class SMALL_RECT(Structure): - """struct in wincon.h.""" - _fields_ = [ - ("Left", SHORT), - ("Top", SHORT), - ("Right", SHORT), - ("Bottom", SHORT), - ] - - class CONSOLE_SCREEN_BUFFER_INFO(Structure): - """struct in wincon.h.""" - _fields_ = [ - ("dwSize", COORD), - ("dwCursorPosition", COORD), - ("wAttributes", WORD), - ("srWindow", SMALL_RECT), - ("dwMaximumWindowSize", COORD), - ] - def __str__(self): - return '(%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d)' % ( - self.dwSize.Y, self.dwSize.X - , self.dwCursorPosition.Y, self.dwCursorPosition.X - , self.wAttributes - , self.srWindow.Top, self.srWindow.Left, self.srWindow.Bottom, self.srWindow.Right - , self.dwMaximumWindowSize.Y, self.dwMaximumWindowSize.X - ) - - def GetConsoleScreenBufferInfo(stream_id=STDOUT): - handle = handles[stream_id] - csbi = CONSOLE_SCREEN_BUFFER_INFO() - success = windll.kernel32.GetConsoleScreenBufferInfo( - handle, byref(csbi)) - return csbi - - - def SetConsoleTextAttribute(stream_id, attrs): - handle = handles[stream_id] - return windll.kernel32.SetConsoleTextAttribute(handle, attrs) - - - def SetConsoleCursorPosition(stream_id, position): - position = COORD(*position) - # If the position is out of range, do nothing. - if position.Y <= 0 or position.X <= 0: - return - # Adjust for Windows' SetConsoleCursorPosition: - # 1. being 0-based, while ANSI is 1-based. - # 2. expecting (x,y), while ANSI uses (y,x). - adjusted_position = COORD(position.Y - 1, position.X - 1) - # Adjust for viewport's scroll position - sr = GetConsoleScreenBufferInfo(STDOUT).srWindow - adjusted_position.Y += sr.Top - adjusted_position.X += sr.Left - # Resume normal processing - handle = handles[stream_id] - return windll.kernel32.SetConsoleCursorPosition(handle, adjusted_position) - - def FillConsoleOutputCharacter(stream_id, char, length, start): - handle = handles[stream_id] - char = TCHAR(char) - length = DWORD(length) - num_written = DWORD(0) - # Note that this is hard-coded for ANSI (vs wide) bytes. - success = windll.kernel32.FillConsoleOutputCharacterA( - handle, char, length, start, byref(num_written)) - return num_written.value - - def FillConsoleOutputAttribute(stream_id, attr, length, start): - ''' FillConsoleOutputAttribute( hConsole, csbi.wAttributes, dwConSize, coordScreen, &cCharsWritten )''' - handle = handles[stream_id] - attribute = WORD(attr) - length = DWORD(length) - num_written = DWORD(0) - # Note that this is hard-coded for ANSI (vs wide) bytes. - return windll.kernel32.FillConsoleOutputAttribute( - handle, attribute, length, start, byref(num_written)) - +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. + +# from winbase.h +STDOUT = -11 +STDERR = -12 + +try: + from ctypes import windll + from ctypes import wintypes +except ImportError: + windll = None + SetConsoleTextAttribute = lambda *_: None +else: + from ctypes import ( + byref, Structure, c_char, c_short, c_uint32, c_ushort, POINTER + ) + + class CONSOLE_SCREEN_BUFFER_INFO(Structure): + """struct in wincon.h.""" + _fields_ = [ + ("dwSize", wintypes._COORD), + ("dwCursorPosition", wintypes._COORD), + ("wAttributes", wintypes.WORD), + ("srWindow", wintypes.SMALL_RECT), + ("dwMaximumWindowSize", wintypes._COORD), + ] + def __str__(self): + return '(%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d)' % ( + self.dwSize.Y, self.dwSize.X + , self.dwCursorPosition.Y, self.dwCursorPosition.X + , self.wAttributes + , self.srWindow.Top, self.srWindow.Left, self.srWindow.Bottom, self.srWindow.Right + , self.dwMaximumWindowSize.Y, self.dwMaximumWindowSize.X + ) + + _GetStdHandle = windll.kernel32.GetStdHandle + _GetStdHandle.argtypes = [ + wintypes.DWORD, + ] + _GetStdHandle.restype = wintypes.HANDLE + + _GetConsoleScreenBufferInfo = windll.kernel32.GetConsoleScreenBufferInfo + _GetConsoleScreenBufferInfo.argtypes = [ + wintypes.HANDLE, + POINTER(CONSOLE_SCREEN_BUFFER_INFO), + ] + _GetConsoleScreenBufferInfo.restype = wintypes.BOOL + + _SetConsoleTextAttribute = windll.kernel32.SetConsoleTextAttribute + _SetConsoleTextAttribute.argtypes = [ + wintypes.HANDLE, + wintypes.WORD, + ] + _SetConsoleTextAttribute.restype = wintypes.BOOL + + _SetConsoleCursorPosition = windll.kernel32.SetConsoleCursorPosition + _SetConsoleCursorPosition.argtypes = [ + wintypes.HANDLE, + wintypes._COORD, + ] + _SetConsoleCursorPosition.restype = wintypes.BOOL + + _FillConsoleOutputCharacterA = windll.kernel32.FillConsoleOutputCharacterA + _FillConsoleOutputCharacterA.argtypes = [ + wintypes.HANDLE, + c_char, + wintypes.DWORD, + wintypes._COORD, + POINTER(wintypes.DWORD), + ] + _FillConsoleOutputCharacterA.restype = wintypes.BOOL + + _FillConsoleOutputAttribute = windll.kernel32.FillConsoleOutputAttribute + _FillConsoleOutputAttribute.argtypes = [ + wintypes.HANDLE, + wintypes.WORD, + wintypes.DWORD, + wintypes._COORD, + POINTER(wintypes.DWORD), + ] + _FillConsoleOutputAttribute.restype = wintypes.BOOL + + handles = { + STDOUT: _GetStdHandle(STDOUT), + STDERR: _GetStdHandle(STDERR), + } + + def GetConsoleScreenBufferInfo(stream_id=STDOUT): + handle = handles[stream_id] + csbi = CONSOLE_SCREEN_BUFFER_INFO() + success = _GetConsoleScreenBufferInfo( + handle, byref(csbi)) + return csbi + + def SetConsoleTextAttribute(stream_id, attrs): + handle = handles[stream_id] + return _SetConsoleTextAttribute(handle, attrs) + + def SetConsoleCursorPosition(stream_id, position): + position = wintypes._COORD(*position) + # If the position is out of range, do nothing. + if position.Y <= 0 or position.X <= 0: + return + # Adjust for Windows' SetConsoleCursorPosition: + # 1. being 0-based, while ANSI is 1-based. + # 2. expecting (x,y), while ANSI uses (y,x). + adjusted_position = wintypes._COORD(position.Y - 1, position.X - 1) + # Adjust for viewport's scroll position + sr = GetConsoleScreenBufferInfo(STDOUT).srWindow + adjusted_position.Y += sr.Top + adjusted_position.X += sr.Left + # Resume normal processing + handle = handles[stream_id] + return _SetConsoleCursorPosition(handle, adjusted_position) + + def FillConsoleOutputCharacter(stream_id, char, length, start): + handle = handles[stream_id] + char = c_char(char) + length = wintypes.DWORD(length) + num_written = wintypes.DWORD(0) + # Note that this is hard-coded for ANSI (vs wide) bytes. + success = _FillConsoleOutputCharacterA( + handle, char, length, start, byref(num_written)) + return num_written.value + + def FillConsoleOutputAttribute(stream_id, attr, length, start): + ''' FillConsoleOutputAttribute( hConsole, csbi.wAttributes, dwConSize, coordScreen, &cCharsWritten )''' + handle = handles[stream_id] + attribute = wintypes.WORD(attr) + length = wintypes.DWORD(length) + num_written = wintypes.DWORD(0) + # Note that this is hard-coded for ANSI (vs wide) bytes. + return _FillConsoleOutputAttribute( + handle, attribute, length, start, byref(num_written)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/colorama/winterm.py new/colorama-0.2.7/colorama/winterm.py --- old/colorama-0.2.5/colorama/winterm.py 2013-02-20 21:01:05.000000000 +0100 +++ new/colorama-0.2.7/colorama/winterm.py 2013-09-20 17:03:01.000000000 +0200 @@ -1,4 +1,4 @@ - +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. from . import win32 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/demos/demo.bat new/colorama-0.2.7/demos/demo.bat --- old/colorama-0.2.5/demos/demo.bat 2011-06-19 20:25:15.000000000 +0200 +++ new/colorama-0.2.7/demos/demo.bat 2013-09-20 17:28:30.000000000 +0200 @@ -1,10 +1,12 @@ +:: Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. -@rem Script to demonstrate features of colorama. +:: Script to demonstrate features of colorama. -@rem This demo is also used to verify correctness visually, because we don't have automated tests. +:: This demo is also used to verify correctness visually, because we don't +:: have automated tests. -@rem Implemented as a bash script which invokes python so that we can test the -@rem behaviour on exit, which resets default colors again. +:: Implemented as a bash script which invokes python so that we can test the +:: behaviour on exit, which resets default colors again. python demo01.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/demos/demo.sh new/colorama-0.2.7/demos/demo.sh --- old/colorama-0.2.5/demos/demo.sh 2011-06-25 11:58:01.000000000 +0200 +++ new/colorama-0.2.7/demos/demo.sh 2013-09-20 17:29:02.000000000 +0200 @@ -1,8 +1,10 @@ #!/usr/bin/env bash +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. # Script to demonstrate features of colorama. -# This demo is also used to verify correctness visually, because we don't have automated tests. +# This demo is also used to verify correctness visually, because we don't have +# automated tests. # Implemented as a bash script which invokes python so that we can test the # behaviour on exit, which resets default colors again. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/demos/demo01.py new/colorama-0.2.7/demos/demo01.py --- old/colorama-0.2.5/demos/demo01.py 2011-06-19 20:19:16.000000000 +0200 +++ new/colorama-0.2.7/demos/demo01.py 2013-09-20 17:00:53.000000000 +0200 @@ -1,4 +1,5 @@ #!/usr/bin/python +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. # print grid of all colors and brightnesses # uses stdout.write to write chars with no newline nor spaces between them diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/demos/demo02.py new/colorama-0.2.7/demos/demo02.py --- old/colorama-0.2.5/demos/demo02.py 2011-06-19 20:21:27.000000000 +0200 +++ new/colorama-0.2.7/demos/demo02.py 2013-09-21 12:20:41.000000000 +0200 @@ -1,4 +1,6 @@ #!/usr/bin/python +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. + # Simple demo of changing foreground, background and brightness. from __future__ import print_function @@ -19,3 +21,5 @@ + Style.BRIGHT + 'bright, ' + Style.NORMAL + 'normal' , end=' ') +print() + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/demos/demo03.py new/colorama-0.2.7/demos/demo03.py --- old/colorama-0.2.5/demos/demo03.py 2011-06-19 20:21:37.000000000 +0200 +++ new/colorama-0.2.7/demos/demo03.py 2013-09-20 17:03:01.000000000 +0200 @@ -1,4 +1,6 @@ #!/usr/bin/python +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. + # Demonstrate the different behavior when autoreset is True and False. from __future__ import print_function diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/demos/demo04.py new/colorama-0.2.7/demos/demo04.py --- old/colorama-0.2.5/demos/demo04.py 2011-06-25 11:58:01.000000000 +0200 +++ new/colorama-0.2.7/demos/demo04.py 2013-09-20 17:03:01.000000000 +0200 @@ -1,4 +1,6 @@ #!/usr/bin/python +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. + # check that stripped ANSI in redirected stderr does not affect stdout from __future__ import print_function import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/demos/demo05.py new/colorama-0.2.7/demos/demo05.py --- old/colorama-0.2.5/demos/demo05.py 2011-06-19 20:22:18.000000000 +0200 +++ new/colorama-0.2.7/demos/demo05.py 2013-09-20 17:03:01.000000000 +0200 @@ -1,4 +1,6 @@ #!/usr/bin/python +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. + # Demonstrate the difference between colorama intialized with wrapping on and off. # The point of the demonstration is to show how the ANSI wrapping on Windows can be disabled. # The unwrapped cases will be interpreted with ANSI on Unix, but not on Windows. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/demos/demo06.py new/colorama-0.2.7/demos/demo06.py --- old/colorama-0.2.5/demos/demo06.py 2011-06-19 20:24:21.000000000 +0200 +++ new/colorama-0.2.7/demos/demo06.py 2013-09-21 12:21:00.000000000 +0200 @@ -1,3 +1,5 @@ +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. +from __future__ import print_function import fixpath import colorama from colorama import Fore, Back, Style diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/demos/demo07.py new/colorama-0.2.7/demos/demo07.py --- old/colorama-0.2.5/demos/demo07.py 2011-06-19 19:45:56.000000000 +0200 +++ new/colorama-0.2.7/demos/demo07.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -import colorama -from colorama import Fore, Back, Style -from random import randint, choice -from string import printable - -# Fore, Back and Style are convenience classes for the constant ANSI strings that set -# the foreground, background and style. The don't have any magic of their own. -FORES = [ Fore.BLACK, Fore.RED, Fore.GREEN, Fore.YELLOW, Fore.BLUE, Fore.MAGENTA, Fore.CYAN, Fore.WHITE ] -BACKS = [ Back.BLACK, Back.RED, Back.GREEN, Back.YELLOW, Back.BLUE, Back.MAGENTA, Back.CYAN, Back.WHITE ] -STYLES = [ Style.DIM, Style.NORMAL, Style.BRIGHT ] - -# This assumes your terminal is 80x24. Ansi minimum coordinate is (1,1). -MINY, MAXY = 1, 24 -MINX, MAXX = 1, 80 - -# set of printable ASCII characters, including a space. -CHARS = ' ' + printable.strip() - -PASSES = 1000 - -def main(): - colorama.init() - # gratuitous use of lambda. - pos = lambda y, x: '\x1b[%d;%dH' % (y, x) - # draw a white border. - print(Back.WHITE, end='') - print('%s%s' % (pos(MINY, MINX), ' '*MAXX), end='') - for y in range(MINY, 1+MAXY): - print('%s %s ' % (pos(y, MINX), pos(y, MAXX)), end='') - print('%s%s' % (pos(MAXY, MINX), ' '*MAXX), end='') - # draw some blinky lights for a while. - for i in range(PASSES): - print('%s%s%s%s%s' % (pos(randint(1+MINY,MAXY-1), randint(1+MINX,MAXX-1)), choice(FORES), choice(BACKS), choice(STYLES), choice(CHARS)), end='') - # put cursor to top, left, and set color to white-on-black with normal brightness. - print('%s%s%s%s' % (pos(MINY, MINX), Fore.WHITE, Back.BLACK, Style.NORMAL), end='') - -if __name__ == '__main__': - main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/demos/fixpath.py new/colorama-0.2.7/demos/fixpath.py --- old/colorama-0.2.5/demos/fixpath.py 2011-06-19 20:20:51.000000000 +0200 +++ new/colorama-0.2.7/demos/fixpath.py 2013-09-20 17:03:01.000000000 +0200 @@ -1,3 +1,5 @@ +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. + # Add demo dir's parent to sys path, so that 'import colorama' always finds # the local source in preference to any installed version of colorama. import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colorama-0.2.5/setup.py new/colorama-0.2.7/setup.py --- old/colorama-0.2.5/setup.py 2013-02-20 20:41:39.000000000 +0100 +++ new/colorama-0.2.7/setup.py 2013-09-21 12:10:47.000000000 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env python - +# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file. from os.path import dirname, join from distutils.core import setup -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
