x
/
os-log-merger
Code Issues Proposed changes

Merge "Delete some dead code"

This commit is contained in:
Zuul 2018-02-11 08:00:09 +00:00 committed by Gerrit Code Review
parent 3a6b12679d 1c6d22503d
commit 06a41984d0
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
oslogmerger/oslogmerger.py
View File

@ -440,19 +440,6 @@ class LogFile(object):
raise StopIteration() raise StopIteration()
return self.entry return self.entry
def peek(self):
return self.entry
def __cmp__(self, other):
if other.peek() is None or self.peek() is None:
if self.peek() is None:
return 0 if other.peek() is None else 1
return -1
if (other.peek() or self.peek()) is None:
return 0 if self.peek() is None else -1
return cmp(self.peek(), other.peek())
# Log file formats with command line options # Log file formats with command line options
LOG_TYPES = { LOG_TYPES = {