openstack/deb-python-taskflow
Code Issues Proposed changes

Merge "Prefer posixpath to os.path"

Browse Source
This commit is contained in:
Jenkins
2015-03-25 21:24:40 +00:00
committed by Gerrit Code Review
parent cdcb248a65 cd5413902d
commit c85805fca1
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
taskflow/persistence/backends/impl_memory.py
View File

@@ -17,7 +17,7 @@
import contextlib import contextlib
import copy import copy
import os import posixpath as pp
from taskflow import exceptions as exc from taskflow import exceptions as exc
from taskflow.persistence import path_based from taskflow.persistence import path_based
@@ -29,14 +29,14 @@ class FakeFilesystem(object):
"""An in-memory filesystem-like structure.""" """An in-memory filesystem-like structure."""
#: Root path of the in-memory filesystem. #: Root path of the in-memory filesystem.
root_path = os.sep root_path = pp.sep
@classmethod @classmethod
def _normpath(cls, path): def _normpath(cls, path):
if not path.startswith(cls.root_path): if not path.startswith(cls.root_path):
raise ValueError("This filesystem can only normalize absolute" raise ValueError("This filesystem can only normalize absolute"
" paths: '%s' is not valid" % path) " paths: '%s' is not valid" % path)
return os.path.normpath(path) return pp.normpath(path)
def __init__(self, deep_copy=True): def __init__(self, deep_copy=True):
self._root = tree.Node(self.root_path, value=None) self._root = tree.Node(self.root_path, value=None)
@@ -98,11 +98,11 @@ class FakeFilesystem(object):
# split correctly: # split correctly:
# #
# >>> path = "/" # >>> path = "/"
# path.split(os.sep) # path.split(pp.sep)
# ['', ''] # ['', '']
parts = [] parts = []
else: else:
parts = path.split(os.sep)[1:] parts = path.split(pp.sep)[1:]
if include_root: if include_root:
parts.insert(0, self._root.item) parts.insert(0, self._root.item)
for piece in parts: for piece in parts:
@@ -120,7 +120,7 @@ class FakeFilesystem(object):
def symlink(self, src_path, dest_path): def symlink(self, src_path, dest_path):
dest_path = self._normpath(dest_path) dest_path = self._normpath(dest_path)
src_path = self._normpath(src_path) src_path = self._normpath(src_path)
dirname, basename = os.path.split(dest_path) dirname, basename = pp.split(dest_path)
parent_node = self._fetch_node(dirname) parent_node = self._fetch_node(dirname)
child_node = parent_node.find(basename, child_node = parent_node.find(basename,
only_direct=True, only_direct=True,
@@ -140,7 +140,7 @@ class FakeFilesystem(object):
item_node = self._fetch_node(path) item_node = self._fetch_node(path)
item_node.metadata.update(value=value) item_node.metadata.update(value=value)
except exc.NotFound: except exc.NotFound:
dirname, basename = os.path.split(path) dirname, basename = pp.split(path)
parent_node = self._fetch_node(dirname) parent_node = self._fetch_node(dirname)
parent_node.add(tree.Node(basename, value=value)) parent_node.add(tree.Node(basename, value=value))
@@ -159,7 +159,7 @@ class MemoryBackend(path_based.PathBasedBackend):
def __init__(self, conf=None): def __init__(self, conf=None):
super(MemoryBackend, self).__init__(conf) super(MemoryBackend, self).__init__(conf)
if self._path is None: if self._path is None:
self._path = os.sep self._path = pp.sep
self.memory = FakeFilesystem(deep_copy=self._conf.get('deep_copy', self.memory = FakeFilesystem(deep_copy=self._conf.get('deep_copy',
True)) True))
self.lock = lock_utils.ReaderWriterLock() self.lock = lock_utils.ReaderWriterLock()
@@ -191,7 +191,7 @@ class Connection(path_based.PathBasedConnection):
raise exc.StorageFailure("Storage backend internal error", e) raise exc.StorageFailure("Storage backend internal error", e)
def _join_path(self, *parts): def _join_path(self, *parts):
return os.path.join(*parts) return pp.join(*parts)
def _get_item(self, path): def _get_item(self, path):
with self._memory_lock(): with self._memory_lock():