mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #344 from rpodgorny/no-rawconfigparser 

move away from RawConfigParser to ConfigParser
This commit is contained in:
TW 2015-10-31 22:43:08 +01:00
parent 3c2dee6eb6 5cc25d986a
commit d41f7d1e09
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
borg/cache.py
View File

@ -112,7 +112,7 @@ Chunk index: {0.total_unique_chunks:20d} {0.total_chunks:20d}"""
os.makedirs(self.path) os.makedirs(self.path)
with open(os.path.join(self.path, 'README'), 'w') as fd: with open(os.path.join(self.path, 'README'), 'w') as fd:
fd.write('This is a Borg cache') fd.write('This is a Borg cache')
config = configparser.RawConfigParser() config = configparser.ConfigParser(interpolation=None)
config.add_section('cache') config.add_section('cache')
config.set('cache', 'version', '1') config.set('cache', 'version', '1')
config.set('cache', 'repository', hexlify(self.repository.id).decode('ascii')) config.set('cache', 'repository', hexlify(self.repository.id).decode('ascii'))
@ -132,7 +132,7 @@ Chunk index: {0.total_unique_chunks:20d} {0.total_chunks:20d}"""
shutil.rmtree(self.path) shutil.rmtree(self.path)
def _do_open(self): def _do_open(self):
self.config = configparser.RawConfigParser() self.config = configparser.ConfigParser(interpolation=None)
config_path = os.path.join(self.path, 'config') config_path = os.path.join(self.path, 'config')
self.config.read(config_path) self.config.read(config_path)
try: try:

10
borg/repository.py
View File

@ -1,4 +1,4 @@
from configparser import RawConfigParser from configparser import ConfigParser
from binascii import hexlify from binascii import hexlify
from itertools import islice from itertools import islice
import errno import errno
@ -79,11 +79,11 @@ class Repository:
with open(os.path.join(path, 'README'), 'w') as fd: with open(os.path.join(path, 'README'), 'w') as fd:
fd.write('This is a Borg repository\n') fd.write('This is a Borg repository\n')
os.mkdir(os.path.join(path, 'data')) os.mkdir(os.path.join(path, 'data'))
config = RawConfigParser() config = ConfigParser(interpolation=None)
config.add_section('repository') config.add_section('repository')
config.set('repository', 'version', '1') config.set('repository', 'version', '1')
config.set('repository', 'segments_per_dir', self.DEFAULT_SEGMENTS_PER_DIR) config.set('repository', 'segments_per_dir', str(self.DEFAULT_SEGMENTS_PER_DIR))
config.set('repository', 'max_segment_size', self.DEFAULT_MAX_SEGMENT_SIZE) config.set('repository', 'max_segment_size', str(self.DEFAULT_MAX_SEGMENT_SIZE))
config.set('repository', 'id', hexlify(os.urandom(32)).decode('ascii')) config.set('repository', 'id', hexlify(os.urandom(32)).decode('ascii'))
self.save_config(path, config) self.save_config(path, config)
@ -136,7 +136,7 @@ class Repository:
if not os.path.isdir(path): if not os.path.isdir(path):
raise self.DoesNotExist(path) raise self.DoesNotExist(path)
self.lock = UpgradableLock(os.path.join(path, 'lock'), exclusive).acquire() self.lock = UpgradableLock(os.path.join(path, 'lock'), exclusive).acquire()
self.config = RawConfigParser() self.config = ConfigParser(interpolation=None)
self.config.read(os.path.join(self.path, 'config')) self.config.read(os.path.join(self.path, 'config'))
if 'repository' not in self.config.sections() or self.config.getint('repository', 'version') != 1: if 'repository' not in self.config.sections() or self.config.getint('repository', 'version') != 1:
raise self.InvalidRepository(path) raise self.InvalidRepository(path)

4
borg/testsuite/archiver.py
View File

@ -1,5 +1,5 @@
from binascii import hexlify from binascii import hexlify
from configparser import RawConfigParser from configparser import ConfigParser
import errno import errno
import os import os
from io import StringIO from io import StringIO
@ -318,7 +318,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
return Repository(self.repository_path).id return Repository(self.repository_path).id
def _set_repository_id(self, path, id): def _set_repository_id(self, path, id):
config = RawConfigParser() config = ConfigParser(interpolation=None)
config.read(os.path.join(path, 'config')) config.read(os.path.join(path, 'config'))
config.set('repository', 'id', hexlify(id).decode('ascii')) config.set('repository', 'id', hexlify(id).decode('ascii'))
with open(os.path.join(path, 'config'), 'w') as fd: with open(os.path.join(path, 'config'), 'w') as fd: