From 73ead3f7efeafa9ea6849e6a853d83d171180dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20M=C3=A4der?= <maeder@phys.ethz.ch>
Date: Thu, 12 Apr 2018 22:41:31 +0200
Subject: [PATCH] Improve regex
---
bin/deltalogcat.py | 7 -------
bin/deltalogparse.py | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/bin/deltalogcat.py b/bin/deltalogcat.py
index 267bdf2..2bbc3b8 100755
--- a/bin/deltalogcat.py
+++ b/bin/deltalogcat.py
@@ -34,13 +34,6 @@ NODES = {
}
-def getlastline(fname):
- """Using mmap to return a copy of the last line of a file"""
- with open(fname) as source:
- mapping = mmap.mmap(source.fileno(), 0, prot=mmap.PROT_READ)
- return mapping[mapping.rfind(b'\n', 0, -1)+1:]
-
-
def sleep(start_time):
"""After hard work, take a nap for the rest of the second"""
current_time = time.perf_counter()
diff --git a/bin/deltalogparse.py b/bin/deltalogparse.py
index e5cc931..b3d059e 100755
--- a/bin/deltalogparse.py
+++ b/bin/deltalogparse.py
@@ -55,7 +55,7 @@ rgx_redacted = re.compile(
r'userPassword'
r'):')
-rgx_attr_key = re.compile(r'^(?P<key>.*?)(?P<delimiter>:[=+-:]? ?)')
+rgx_attr_key = re.compile(r'^(?P<key>.*?)(?P<delimiter>:[-+=#] )')
def lock(lock_file):
--
GitLab