Skip to content

Harmonize line endings amongst source file and search/replace text. #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thebjorn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Harmonize line endings amongst source file and search/replace text. #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions bumpversion/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,14 +234,33 @@ def replace(self, current_version, new_version, context, dry_run):
with io.open(self.path, 'rb') as f:
file_content_before = f.read().decode('utf-8')

def line_ending(txt):
lines = txt.splitlines(True)
if not lines:
return os.linesep # use system default
first = lines[0]
if first.endswith('\r\n'):
return '\r\n'
if first.endswith('\n'):
return '\n'
if first.endswith('\r'):
return '\r'
return os.linesep

eol = line_ending(file_content_before)

context['current_version'] = self._versionconfig.serialize(current_version, context)
context['new_version'] = self._versionconfig.serialize(new_version, context)

search_for = self._versionconfig.search.format(**context)
replace_with = self._versionconfig.replace.format(**context)

search_for_eol = line_ending(search_for)
replace_with_eol = line_ending(replace_with)

file_content_after = file_content_before.replace(
search_for, replace_with
search_for.replace(search_for_eol, eol),
replace_with.replace(replace_with_eol, eol)
)

if file_content_before == file_content_after:
Expand Down Expand Up @@ -714,7 +733,7 @@ def main(original_args=None):

for section_name in config.sections():

section_name_match = re.compile("^bumpversion:(file|part):(.+)").match(section_name)
section_name_match = re.compile(r"^bumpversion:(file|part):(.+)").match(section_name)

if not section_name_match:
continue
Expand Down Expand Up @@ -743,7 +762,7 @@ def main(original_args=None):
section_config['part_configs'] = part_configs

if not 'parse' in section_config:
section_config['parse'] = defaults.get("parse", '(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)')
section_config['parse'] = defaults.get("parse", r'(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)')

if not 'serialize' in section_config:
section_config['serialize'] = defaults.get('serialize', [str('{major}.{minor}.{patch}')])
Expand Down