diff options
author | jquast <contact@jeffquast.com> | 2013-09-07 15:41:21 -0400 |
---|---|---|
committer | jquast <contact@jeffquast.com> | 2013-09-07 15:42:53 -0400 |
commit | 9efb7ba8200d65afce928e9b1866881fde7df214 (patch) | |
tree | b7d6a9e95ac121ad76ded87eb937c717aca10197 /blessings/__init__.py | |
parent | 2a36b4059e5bf20a3c9d5da027d30659ff00e965 (diff) | |
download | blessings-9efb7ba8200d65afce928e9b1866881fde7df214.tar.gz |
remove git-merge junk, CVS merges have been easier
Diffstat (limited to 'blessings/__init__.py')
-rw-r--r-- | blessings/__init__.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/blessings/__init__.py b/blessings/__init__.py index 16c7bed..60995b7 100644 --- a/blessings/__init__.py +++ b/blessings/__init__.py @@ -85,17 +85,10 @@ class Terminal(object): except IOUnsupportedOperation: stream_descriptor = None -<<<<<<< HEAD - self._is_a_tty = (stream_descriptor is not None and - isatty(stream_descriptor)) - self._does_styling = ((self.is_a_tty or force_styling) and - force_styling is not None) -======= self.is_a_tty = (stream_descriptor is not None and os.isatty(stream_descriptor)) self.does_styling = ((self.is_a_tty or force_styling) and force_styling is not None) ->>>>>>> 'os' imported but unused # The desciptor to direct terminal initialization sequences to. # sys.__stdout__ seems to always have a descriptor of 1, even if output |