debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 19:08:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

python: rename _verify_dir_initialized to _assert_dir_is_initialized

Browse source 
Rename the function to clarify its effect and remove all the comments
accompanying each call to the function.

Modified by Sebastian Spaeth to apply cleanly again and remove some
blank lines.

Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Justus Winter 2011-09-26 03:05:34 +02:00 committed by Sebastian Spaeth
parent 94a1bb88aa
commit f88d985e50
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bindings/python/notmuch/database.py
View file

@ -697,7 +697,7 @@ class Directory(object):
_get_child_directories = nmlib.notmuch_directory_get_child_directories _get_child_directories = nmlib.notmuch_directory_get_child_directories
_get_child_directories.restype = c_void_p _get_child_directories.restype = c_void_p
def _verify_dir_initialized(self): def _assert_dir_is_initialized(self):
"""Raises a NotmuchError(STATUS.NOT_INITIALIZED) if dir_p is None""" """Raises a NotmuchError(STATUS.NOT_INITIALIZED) if dir_p is None"""
if self._dir_p is None: if self._dir_p is None:
raise NotmuchError(STATUS.NOT_INITIALIZED) raise NotmuchError(STATUS.NOT_INITIALIZED)
@ -752,9 +752,7 @@ class Directory(object):
STATUS.NOT_INITIALIZED STATUS.NOT_INITIALIZED
The directory has not been initialized The directory has not been initialized
""" """
#Raise a NotmuchError(STATUS.NOT_INITIALIZED) if the dir_p is None self._assert_dir_is_initialized()
self._verify_dir_initialized()
#TODO: make sure, we convert the mtime parameter to a 'c_long' #TODO: make sure, we convert the mtime parameter to a 'c_long'
status = Directory._set_mtime(self._dir_p, mtime) status = Directory._set_mtime(self._dir_p, mtime)
@ -776,9 +774,7 @@ class Directory(object):
STATUS.NOT_INITIALIZED STATUS.NOT_INITIALIZED
The directory has not been initialized The directory has not been initialized
""" """
#Raise a NotmuchError(STATUS.NOT_INITIALIZED) if self.dir_p is None self._assert_dir_is_initialized()
self._verify_dir_initialized()
return Directory._get_mtime(self._dir_p) return Directory._get_mtime(self._dir_p)
# Make mtime attribute a property of Directory() # Make mtime attribute a property of Directory()
@ -795,9 +791,7 @@ class Directory(object):
The returned filenames will be the basename-entries only (not The returned filenames will be the basename-entries only (not
complete paths. complete paths.
""" """
#Raise a NotmuchError(STATUS.NOT_INITIALIZED) if self._dir_p is None self._assert_dir_is_initialized()
self._verify_dir_initialized()
files_p = Directory._get_child_files(self._dir_p) files_p = Directory._get_child_files(self._dir_p)
return Filenames(files_p, self) return Filenames(files_p, self)
@ -808,9 +802,7 @@ class Directory(object):
The returned filenames will be the basename-entries only (not The returned filenames will be the basename-entries only (not
complete paths. complete paths.
""" """
#Raise a NotmuchError(STATUS.NOT_INITIALIZED) if self._dir_p is None self._assert_dir_is_initialized()
self._verify_dir_initialized()
files_p = Directory._get_child_directories(self._dir_p) files_p = Directory._get_child_directories(self._dir_p)
return Filenames(files_p, self) return Filenames(files_p, self)