Merge pull request #526 from fortable1999/master

SegmentWriter.__repr__ support printing unsuceesful initialized object
mchaput · Jan 9, 2019 · f4e4ea9 · f4e4ea9
2 parents 441f729 + b43e5a4
commit f4e4ea9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -15,7 +15,7 @@ formats = zip,gztar
 push = sdist bdist_wheel upload
 pushdocs = build_sphinx upload_sphinx
 
-[pytest]
+[tool:pytest]
 ; --tb= traceback print mode (long/short/line/native/no)
 addopts = -rs --tb=native
 

diff --git a/src/whoosh/writing.py b/src/whoosh/writing.py
@@ -547,7 +547,12 @@ def __init__(self, ix, poolclass=None, timeout=0.0, delay=0.1, _lk=True,
         self.mergetype = None
 
     def __repr__(self):
-        return "<%s %r>" % (self.__class__.__name__, self.newsegment)
+        # Author: Ronald Evers
+        # Origin bitbucket issue: https://bitbucket.org/mchaput/whoosh/issues/483
+        # newsegment might not be set due to LockError
+        # so use getattr to be safe
+        return "<%s %r>" % (self.__class__.__name__,
+                            getattr(self, 'newsegment', None))
 
     def _check_state(self):
         if self.is_closed: