Summary

Fix compatibility with Python < 2.7

Review Request #6207 — Created Aug. 7, 2014 and submitted Aug. 7, 2014, 4:15 p.m.

Information

Owner

david

Repository

Review Board

Branch

release-1.7.x

Bugs

Depends On

Commit

e0cef2b...

Reviewers

Groups

reviewboard

People

Description

My change for handling alternate casing in svn:keywords only worked with Python
2.7 (prior versions don't have a `flags` argument to `re.sub()`).

This change makes it so we compile the regex first using re.IGNORECASE, and
then call the substitution method on the regex object.

Testing done: Ran tests under python 2.6

Testing Done

Ran tests under python 2.6

Tool: Pyflakes
Processed Files:
    reviewboard/scmtools/svn.py



Tool: PEP8 Style Checker
Processed Files:
    reviewboard/scmtools/svn.py

Diff:

Revision 2 (+36 -5)

Show changes

	reviewboard/scmtools/svn.py
	reviewboard/scmtools/tests.py

Tool: Pyflakes
Processed Files:
    reviewboard/scmtools/tests.py
    reviewboard/scmtools/svn.py



Tool: PEP8 Style Checker
Processed Files:
    reviewboard/scmtools/tests.py
    reviewboard/scmtools/svn.py

Instead of all this, you can just put (?i) at the very beginning of the regex string, and it'll activate the right flag.

chipx86 Aug. 7, 2014, 1:32 p.m.

Actually, the best way is for the regex to just be compiled instead of recreated every time. Then, you can pass the flag there.

david Aug. 7, 2014, 1:37 p.m.

Well, the actual contents of the regex change based on the contents of the keywords property, so I can't avoid recreating it (we only want to do the substitution if svn also does the substitution). That said, I can use compile and then .sub on the regex object.

Description:

		My change for handling alternate casing in svn:keywords only worked with Python
~		2.7 (prior versions don't have a `flags` argument to `re.sub()`). After doing
~		some investigation, I've decided that we don't actually need to do the regex
~		sub with `re.IGNORECASE`, because the match is based on the particular contents
~		of the svn:keywords property for the given file, and not on our keywords list
~		(which is used for substitutions).
	~	2.7 (prior versions don't have a `flags` argument to `re.sub()`).
	~
	~	This change makes it so we compile the regex first using re.IGNORECASE, and
	~	then call the substitution method on the regex object.
	~
	+	Testing done: Ran tests under python 2.6

Commit:

-	e4df0ece6b21a8a3c47e30a6c3be33c7b6ed85ee
+	e0cef2be1d2a53b637a2dbeac11d746e1fc391f2

Diff:

Revision 3 (+24 -2)

Show changes

	reviewboard/scmtools/svn.py
	reviewboard/scmtools/tests.py

Tool: Pyflakes
Processed Files:
    reviewboard/scmtools/tests.py
    reviewboard/scmtools/svn.py



Tool: PEP8 Style Checker
Processed Files:
    reviewboard/scmtools/tests.py
    reviewboard/scmtools/svn.py

reviewboard/scmtools/svn.py (Diff revision 3)

Worth compiling it on the class?

david Aug. 7, 2014, 4:05 p.m.

Can't be done. See my reply to your previous comment.

chipx86 Aug. 7, 2014, 4:06 p.m.
```
Oh oops, you're right. Ship it!
```

Ship it!

```
Ship It!
```

Status: Closed (submitted)

Change Summary:

Pushed to release-1.7.x (4d0672b)