[PATCH 1/3] CLI/git: remove unused import

[PATCH 1/3] CLI/git: remove unused import

[Jakub Wilk]

shutil was used only for the tempfile.TemporaryDirectory backport,
which was removed in commit b7c31f658121a0cf ("CLI/git: drop support for
python < 3.2").
---
 notmuch-git.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/notmuch-git.py b/notmuch-git.py
index 57098aae..a11501ae 100644
--- a/notmuch-git.py
+++ b/notmuch-git.py
@@ -31,7 +31,6 @@ import locale as _locale
 import logging as _logging
 import os as _os
 import re as _re
-import shutil as _shutil
 import subprocess as _subprocess
 import sys as _sys
 import tempfile as _tempfile
-- 
2.39.2

[PATCH 2/3] CLI/git: fix name error

[Jakub Wilk]

---
 notmuch-git.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notmuch-git.py b/notmuch-git.py
index a11501ae..29f75531 100644
--- a/notmuch-git.py
+++ b/notmuch-git.py
@@ -247,7 +247,7 @@ def count_messages(prefix=None):
         stdout=_subprocess.PIPE, wait=True)
     if status != 0:
         _LOG.error("failed to run notmuch config")
-        sys.exit(1)
+        _sys.exit(1)
     return int(stdout.rstrip())
 
 def get_tags(prefix=None):
-- 
2.39.2

[PATCH 3/3] CLI/git: remove no-op format() call

[Jakub Wilk]

---
 notmuch-git.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notmuch-git.py b/notmuch-git.py
index 29f75531..97073c80 100644
--- a/notmuch-git.py
+++ b/notmuch-git.py
@@ -376,7 +376,7 @@ def check_safe_fraction(status):
 
     total = count_messages (TAG_PREFIX)
     if total == 0:
-        _LOG.error('No existing tags with given prefix, stopping.'.format(safe))
+        _LOG.error('No existing tags with given prefix, stopping.')
         _LOG.error('Use --force to override.')
         exit(1)
     change = len(status['added'])+len(status['deleted'])
-- 
2.39.2

Re: [PATCH 1/3] CLI/git: remove unused import

[David Bremner]

Jakub Wilk <jwilk@jwilk.net> writes:

> shutil was used only for the tempfile.TemporaryDirectory backport,
> which was removed in commit b7c31f658121a0cf ("CLI/git: drop support for
> python < 3.2").

Series applied to master.