From 68d2647e38cadd0c9eaa816f548c9ff74ecd1739 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Sat, 1 Oct 2016 16:01:12 +0200
Subject: [PATCH] Add flake8-bugbear

---
 Makefile                         | 2 +-
 setup.cfg                        | 2 +-
 tests/cli/test_utils.py          | 2 +-
 vdirsyncer/cli/__init__.py       | 2 +-
 vdirsyncer/cli/tasks.py          | 4 ++--
 vdirsyncer/storage/singlefile.py | 3 ---
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 00d0c73..e01950d 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ test:
 	fi
 
 install-style:
-	pip install flake8 flake8-import-order sphinx
+	pip install flake8 flake8-import-order flake8-bugbear sphinx
 	
 style:
 	flake8
diff --git a/setup.cfg b/setup.cfg
index 6cbade0..d0c3600 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,4 +7,4 @@ norecursedirs = tests/storage/servers/*
 [flake8]
 # W503: Line break before operator
 ignore = W503, E731
-exclude = tests/storage/servers/*
+exclude = tests/storage/servers/*, build/
diff --git a/tests/cli/test_utils.py b/tests/cli/test_utils.py
index 0add86a..9f2aea1 100644
--- a/tests/cli/test_utils.py
+++ b/tests/cli/test_utils.py
@@ -5,7 +5,7 @@ from vdirsyncer.cli.utils import handle_cli_error
 def test_handle_cli_error(capsys):
     try:
         raise exceptions.InvalidResponse('ayy lmao')
-    except:
+    except BaseException:
         handle_cli_error()
 
     out, err = capsys.readouterr()
diff --git a/vdirsyncer/cli/__init__.py b/vdirsyncer/cli/__init__.py
index fcb5610..ed2ea74 100644
--- a/vdirsyncer/cli/__init__.py
+++ b/vdirsyncer/cli/__init__.py
@@ -29,7 +29,7 @@ def catch_errors(f):
     def inner(*a, **kw):
         try:
             f(*a, **kw)
-        except:
+        except BaseException:
             from .utils import handle_cli_error
             handle_cli_error()
             sys.exit(1)
diff --git a/vdirsyncer/cli/tasks.py b/vdirsyncer/cli/tasks.py
index ea52234..b0236f5 100644
--- a/vdirsyncer/cli/tasks.py
+++ b/vdirsyncer/cli/tasks.py
@@ -61,7 +61,7 @@ def sync_collection(wq, collection, general, force_delete):
             conflict_resolution=pair.conflict_resolution,
             force_delete=force_delete
         )
-    except:
+    except BaseException:
         handle_cli_error(status_name)
         raise JobFailed()
 
@@ -127,7 +127,7 @@ def metasync_collection(wq, collection, general):
             conflict_resolution=pair.options.get('conflict_resolution', None),
             keys=pair.options.get('metadata', None) or ()
         )
-    except:
+    except BaseException:
         handle_cli_error(status_name)
         raise JobFailed()
 
diff --git a/vdirsyncer/storage/singlefile.py b/vdirsyncer/storage/singlefile.py
index 9057123..b72e47b 100644
--- a/vdirsyncer/storage/singlefile.py
+++ b/vdirsyncer/storage/singlefile.py
@@ -232,9 +232,6 @@ class SingleFileStorage(Storage):
         self._at_once = True
         try:
             yield self
-        except:
-            raise
-        else:
             self._write()
         finally:
             self._at_once = False