diff options
| -rw-r--r-- | genbackupdatalib/names.py | 3 | ||||
| -rw-r--r-- | genbackupdatalib/names_tests.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/genbackupdatalib/names.py b/genbackupdatalib/names.py index 02a47ef..f6ba4e1 100644 --- a/genbackupdatalib/names.py +++ b/genbackupdatalib/names.py @@ -63,8 +63,9 @@ class NameGenerator(object): return tuple(items) def _next_candidate_name(self): + items = self._path_tuple(self.counter) self.counter += 1 - return os.path.join(self.dirname, 'file%d' % self.counter) + return os.path.join(self.dirname, *[str(i) for i in items]) def new(self): while True: diff --git a/genbackupdatalib/names_tests.py b/genbackupdatalib/names_tests.py index f31a61b..2f3483f 100644 --- a/genbackupdatalib/names_tests.py +++ b/genbackupdatalib/names_tests.py @@ -59,6 +59,7 @@ class NameGeneratorTests(unittest.TestCase): def test_does_not_generate_names_of_existing_files(self): name = self.names.new() + os.makedirs(os.path.dirname(name)) file(name, 'w').close() names2 = self.new() name2 = names2.new() |