From d89cdff90a21f19b41637308dcc130730d582c0d Mon Sep 17 00:00:00 2001 From: Stefan Wojcik Date: Sat, 10 Dec 2016 14:29:48 -0500 Subject: [PATCH] remove unused import and dont override built-in "id" --- mongoengine/base/document.py | 1 - mongoengine/fields.py | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py index 08150b36..182e4a9e 100644 --- a/mongoengine/base/document.py +++ b/mongoengine/base/document.py @@ -1,6 +1,5 @@ import copy import numbers -import operator from collections import Hashable from functools import partial diff --git a/mongoengine/fields.py b/mongoengine/fields.py index d5336117..cb700885 100644 --- a/mongoengine/fields.py +++ b/mongoengine/fields.py @@ -1395,11 +1395,13 @@ class GridFSProxy(object): get_db(self.db_alias), self.collection_name) return self._fs - def get(self, id=None): - if id: - self.grid_id = id + def get(self, grid_id=None): + if grid_id: + self.grid_id = grid_id + if self.grid_id is None: return None + try: if self.gridout is None: self.gridout = self.fs.get(self.grid_id)