[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [stem/master] Drop use of sys.maxint



commit c8fea2899a40299550b4224c96ec89f670b60796
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Sat Apr 11 14:02:52 2015 -0700

    Drop use of sys.maxint
    
    Turns out python 3.x dropped sys.maxint...
    
      http://stackoverflow.com/questions/13795758/what-is-sys-maxint-in-python-3
    
    That's fine. Honestly just used it to avoid some 'is None' checks.
---
 stem/util/system.py |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/stem/util/system.py b/stem/util/system.py
index f33d8b7..f42951d 100644
--- a/stem/util/system.py
+++ b/stem/util/system.py
@@ -50,7 +50,6 @@ import os
 import platform
 import re
 import subprocess
-import sys
 import tarfile
 import time
 
@@ -772,19 +771,15 @@ def tail(target, lines = None):
 
       return
 
-  if lines is None:
-    lines = sys.maxint
-
   # based on snippet from...
   # https://stackoverflow.com/questions/136168/get-last-n-lines-of-a-file-with-python-similar-to-tail
 
   target.seek(0, 2)  # go to the end of the file
   block_end_byte = target.tell()
-  lines_left = lines
   block_number = -1
   content = ''
 
-  while lines_left > 0 and block_end_byte > 0:
+  while (lines is None or lines > 0) and block_end_byte > 0:
     if (block_end_byte - BLOCK_SIZE > 0):
       # read the last block we haven't yet read
       target.seek(block_number * BLOCK_SIZE, 2)
@@ -795,8 +790,10 @@ def tail(target, lines = None):
       completed_lines = target.read(block_end_byte) + content
 
     for line in reversed(completed_lines.splitlines()):
-      if lines_left > 0:
-        lines_left -= 1
+      if lines is None or lines > 0:
+        if lines is not None:
+          lines -= 1
+
         yield line
 
     block_end_byte -= BLOCK_SIZE



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits