diff options
| author | willmcgugan <willmcgugan@67cdc799-7952-0410-af00-57a81ceafa0f> | 2012-01-11 23:42:36 +0000 |
|---|---|---|
| committer | willmcgugan <willmcgugan@67cdc799-7952-0410-af00-57a81ceafa0f> | 2012-01-11 23:42:36 +0000 |
| commit | 9a8ca7fa4a9a78a763a4f4ed402bb9d195d660fe (patch) | |
| tree | 7fa52406ffed146bc210e2764c4ee6a78fb7ce96 /fs/osfs | |
| parent | cef87f99c67c14d3af752458ac396f202e09f61e (diff) | |
| download | pyfilesystem-9a8ca7fa4a9a78a763a4f4ed402bb9d195d660fe.tar.gz | |
Changed DeleteRootError to RemoveRootError for consistency
git-svn-id: http://pyfilesystem.googlecode.com/svn/trunk@737 67cdc799-7952-0410-af00-57a81ceafa0f
Diffstat (limited to 'fs/osfs')
| -rw-r--r-- | fs/osfs/__init__.py | 2 | ||||
| -rw-r--r-- | fs/osfs/watch_win32.py | 48 |
2 files changed, 25 insertions, 25 deletions
diff --git a/fs/osfs/__init__.py b/fs/osfs/__init__.py index 936e5c0..cc64f18 100644 --- a/fs/osfs/__init__.py +++ b/fs/osfs/__init__.py @@ -287,7 +287,7 @@ class OSFS(OSFSXAttrMixin, OSFSWatchMixin, FS): pass # Don't remove the root directory of this FS if path in ('', '/'): - raise DeleteRootError(path) + raise RemoveRootError(path) os.rmdir(sys_path) # Using os.removedirs() for this can result in dirs being # removed outside the root of this FS, so we recurse manually. diff --git a/fs/osfs/watch_win32.py b/fs/osfs/watch_win32.py index 0bf1491..1aa23a6 100644 --- a/fs/osfs/watch_win32.py +++ b/fs/osfs/watch_win32.py @@ -240,17 +240,17 @@ class WatchedDirectory(object): self.callback(os.path.join(self.path,name),action) def _extract_change_info(self,buffer): - """Extract the information out of a FILE_NOTIFY_INFORMATION structure.""" - pos = 0 - while pos < len(buffer): - jump, action, namelen = struct.unpack("iii",buffer[pos:pos+12]) - # TODO: this may return a shortname or a longname, with no way - # to tell which. Normalise them somehow? - name = buffer[pos+12:pos+12+namelen].decode("utf16") - yield (name,action) - if not jump: - break - pos += jump + """Extract the information out of a FILE_NOTIFY_INFORMATION structure.""" + pos = 0 + while pos < len(buffer): + jump, action, namelen = struct.unpack("iii",buffer[pos:pos+12]) + # TODO: this may return a shortname or a longname, with no way + # to tell which. Normalise them somehow? + name = buffer[pos+12:pos+12+namelen].decode("utf16") + yield (name,action) + if not jump: + break + pos += jump class WatchThread(threading.Thread): @@ -290,24 +290,24 @@ class WatchThread(threading.Thread): flags = 0 for evt in events: if issubclass(ACCESSED,evt): - do_access = True + do_access = True if issubclass(MODIFIED,evt): - do_change = True - flags |= FILE_NOTIFY_CHANGE_ATTRIBUTES - flags |= FILE_NOTIFY_CHANGE_CREATION - flags |= FILE_NOTIFY_CHANGE_SECURITY + do_change = True + flags |= FILE_NOTIFY_CHANGE_ATTRIBUTES + flags |= FILE_NOTIFY_CHANGE_CREATION + flags |= FILE_NOTIFY_CHANGE_SECURITY if issubclass(CREATED,evt): - flags |= FILE_NOTIFY_CHANGE_FILE_NAME - flags |= FILE_NOTIFY_CHANGE_DIR_NAME + flags |= FILE_NOTIFY_CHANGE_FILE_NAME + flags |= FILE_NOTIFY_CHANGE_DIR_NAME if issubclass(REMOVED,evt): - flags |= FILE_NOTIFY_CHANGE_FILE_NAME - flags |= FILE_NOTIFY_CHANGE_DIR_NAME + flags |= FILE_NOTIFY_CHANGE_FILE_NAME + flags |= FILE_NOTIFY_CHANGE_DIR_NAME if issubclass(MOVED_SRC,evt): - flags |= FILE_NOTIFY_CHANGE_FILE_NAME - flags |= FILE_NOTIFY_CHANGE_DIR_NAME + flags |= FILE_NOTIFY_CHANGE_FILE_NAME + flags |= FILE_NOTIFY_CHANGE_DIR_NAME if issubclass(MOVED_DST,evt): - flags |= FILE_NOTIFY_CHANGE_FILE_NAME - flags |= FILE_NOTIFY_CHANGE_DIR_NAME + flags |= FILE_NOTIFY_CHANGE_FILE_NAME + flags |= FILE_NOTIFY_CHANGE_DIR_NAME if do_access: # Separately capture FILE_NOTIFY_CHANGE_LAST_ACCESS events # so we can reliably generate ACCESSED events. |