Merge branch 'feature/encrypted-data-bags' into encrypted_databags

chef/exceptions.py

@@ -1,11 +1,9 @@
 # Exception hierarchy for chef
 # Copyright (c) 2010 Noah Kantrowitz <[email protected]>
 
-
 class ChefError(Exception):
     """Top-level Chef error."""
 
-
 class ChefServerError(ChefError):
     """An error from a Chef server. May include a HTTP response code."""
 
@@ -23,15 +21,12 @@ def from_error(message, code=None):
         }.get(code, ChefServerError)
         return cls(message, code)
 
-
 class ChefServerNotFoundError(ChefServerError):
     """A 404 Not Found server error."""
 
-
 class ChefAPIVersionError(ChefError):
     """An incompatible API version error"""
 
-
 class ChefObjectTypeError(ChefError):
     """An invalid object type error"""
 

chef/tests/test_api.py

@@ -48,7 +48,7 @@ def test_bad_key_raises(self):
         for item in invalids:
             self.assertRaises(
                 ValueError, ChefAPI, 'foobar', item, 'user')
-    
+
     def test_encryption(self):
         api = self.load('encryption.rb')
         self.assertEqual(api.encryption_version, '2')