| @@ -67,7 +67,11 @@ class Hierarchy(PathLike): | ||||
|         return str(self._path) | ||||
|  | ||||
|     def __dir__(self): | ||||
| <<<<<<< HEAD | ||||
|         return [ | ||||
| ======= | ||||
|         return ( | ||||
| >>>>>>> 2aff6704bc8f14d9a3f73178c4c1709bfc7812b5 | ||||
|             "__dir__", | ||||
|             "__eq__", | ||||
|             "__fspath__", | ||||
| @@ -81,7 +85,11 @@ class Hierarchy(PathLike): | ||||
|             "cleanup", | ||||
|             "read_metadata", | ||||
|             "write_metadata", | ||||
| <<<<<<< HEAD | ||||
|         ] | ||||
| ======= | ||||
|         ) | ||||
| >>>>>>> 2aff6704bc8f14d9a3f73178c4c1709bfc7812b5 | ||||
|  | ||||
|     def _gen_metadata(self): | ||||
|         """Generate metadata for this repository. | ||||
|   | ||||
| @@ -144,7 +144,11 @@ class Repository(Hierarchy): | ||||
|         return next(self._snapshot_iterator) | ||||
|  | ||||
|     def __dir__(self): | ||||
| <<<<<<< HEAD | ||||
|         return [ | ||||
| ======= | ||||
|         return ( | ||||
| >>>>>>> 2aff6704bc8f14d9a3f73178c4c1709bfc7812b5 | ||||
|             super().__dir__(), | ||||
|             "__contains__", | ||||
|             "__delitem__", | ||||
| @@ -160,7 +164,11 @@ class Repository(Hierarchy): | ||||
|             "cleanup", | ||||
|             "create_snapshot", | ||||
|             "symlink_snapshot", | ||||
| <<<<<<< HEAD | ||||
|         ] | ||||
| ======= | ||||
|         ) | ||||
| >>>>>>> 2aff6704bc8f14d9a3f73178c4c1709bfc7812b5 | ||||
|  | ||||
|     @staticmethod | ||||
|     def is_valid_snapshot_name(name): | ||||
|   | ||||
| @@ -32,7 +32,11 @@ class Snapshot(Hierarchy): | ||||
|         self._pkg_dir = self.path / "pkg" | ||||
|  | ||||
|     def __dir__(self): | ||||
| <<<<<<< HEAD | ||||
|         return [super().__dir__(), "ctime", "pkg_dir"] | ||||
| ======= | ||||
|         return super().__dir__(), "ctime", "pkg_dir" | ||||
| >>>>>>> 2aff6704bc8f14d9a3f73178c4c1709bfc7812b5 | ||||
|  | ||||
|     def __repr__(self): | ||||
|         """Return a string representation of this Snapshot.""" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user