Merge branch 'stdedos-master' into develop
This commit is contained in:
commit
e08d6ce0ad
2 changed files with 1 additions and 6 deletions
|
|
@ -31,8 +31,6 @@ signal.signal( signal.SIGPIPE, signal.SIG_DFL )
|
||||||
# Global variable(s)
|
# Global variable(s)
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
PY2 = sys.version_info.major == 2
|
|
||||||
|
|
||||||
context = {}
|
context = {}
|
||||||
debug = False
|
debug = False
|
||||||
|
|
||||||
|
|
@ -744,9 +742,6 @@ def write(colored, stream = sys.stdout):
|
||||||
"""
|
"""
|
||||||
Write "colored" on sys.stdout, then flush.
|
Write "colored" on sys.stdout, then flush.
|
||||||
"""
|
"""
|
||||||
if PY2: # If Python 2.x: force unicode
|
|
||||||
if isinstance(colored, unicode):
|
|
||||||
colored = colored.encode('utf-8')
|
|
||||||
try:
|
try:
|
||||||
stream.write(colored)
|
stream.write(colored)
|
||||||
stream.flush()
|
stream.flush()
|
||||||
|
|
|
||||||
2
setup.py
2
setup.py
|
|
@ -39,7 +39,7 @@ setup(
|
||||||
entry_points={
|
entry_points={
|
||||||
'console_scripts': ['colout=colout.colout:main'],
|
'console_scripts': ['colout=colout.colout:main'],
|
||||||
},
|
},
|
||||||
long_description=open('README.md').read(),
|
long_description=open(os.path.join(os.path.dirname(__file__), 'README.md')).read(),
|
||||||
author='nojhan',
|
author='nojhan',
|
||||||
author_email='nojhan@nojhan.net',
|
author_email='nojhan@nojhan.net',
|
||||||
url='http://nojhan.github.com/colout/',
|
url='http://nojhan.github.com/colout/',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue