Merge pull request #7 from IdanHaim/master

RavenDB-6332

Author: IdanHaim

pyravendb/d_commands/database_commands.py

@@ -320,8 +320,8 @@ def delete_database(self, db_name, hard_delete=False):
             if hard_delete:
                 path += "?hard-delete=true"
             response = self.requests_handler.http_request_handler(path, "DELETE", admin=True)
-            if response.content != '':
-                raise response.raise_for_status()
+            if response.content != '' and response.content != b'':
+                raise exceptions.ErrorResponseException(response.content)
             return response
 
         def get_store_statistics(self):

pyravendb/store/document_session.py

@@ -114,7 +114,8 @@ def _multi_load(self, keys, object_type, includes, nested_object_types):
                     if results[i] is None:
                         self._known_missing_ids.add(ids_of_not_existing_object[i])
                         continue
-                    self._convert_and_save_entity(ids_of_not_existing_object[i], results[i], object_type, nested_object_types)
+                    self._convert_and_save_entity(ids_of_not_existing_object[i], results[i], object_type,
+                                                  nested_object_types)
                 self.save_includes(response_includes)
         return [None if key in self._known_missing_ids else self._entities_by_key[
             key] if key in self._entities_by_key else None for key in keys]
@@ -203,8 +204,8 @@ def delete(self, key_or_entity):
         self._defer_commands.add(commands_data.DeleteCommandData(key_or_entity))
 
     def assert_no_non_unique_instance(self, entity, key):
-        if not (key is None or key.endswith("/") or key not in self._entities_by_key or self._entities_by_key[
-            key] is entity):
+        if not (key is None or key.endswith("/") or key not in self._entities_by_key
+                or self._entities_by_key[key] is entity):
             raise exceptions.NonUniqueObjectException(
                 "Attempted to associate a different object with id '{0}'.".format(key))
 
@@ -310,8 +311,8 @@ def _prepare_for_puts_commands(self, data):
                 key = self._entities_and_metadata[entity]["key"]
                 metadata = self._entities_and_metadata[entity]["metadata"]
                 etag = None
-                if self.advanced.use_optimistic_concurrency or self._entities_and_metadata[entity][
-                    "force_concurrency_check"]:
+                if self.advanced.use_optimistic_concurrency \
+                        or self._entities_and_metadata[entity]["force_concurrency_check"]:
                     etag = self._entities_and_metadata[entity]["etag"] or metadata.get("@etag", Utils.empty_etag())
                 data.entities.append(entity)
                 if key is not None:

setup.py

@@ -3,7 +3,7 @@
 setup(
     name='pyravendb',
     packages=find_packages(),
-    version='1.3.1',
+    version='1.3.1.1',
     description='This is the official python client for RavenDB document database',
     author='Idan Haim Shalom',
     author_email='[email protected]',
@@ -15,7 +15,6 @@
         "pycrypto >= 2.6.1",
         "requests >= 2.9.1",
         "inflector >= 2.0.11",
-        "enum >= 0.4.6",
     ],
     zip_safe=False
 )