793061 - Proper string type assertions in pymake

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Gregory Szorc [:gps]]

Attachment: Allow unicode through on Python 2, v1

The Python in bug 780329 is Python 3 compatible, which means string literals are unicode not str in Python 2.x. Pymake as it is currently coded does not like this. This patch allows pymake to accept unicode strings for variable names. This was the minimal amount of work necessary to get the patches in bug 780329 to work while still running in Python 3 "all strings are Unicode" mode.

Technically, the only change needed is to convert 'str' to 'basestring'. But, I went ahead and gave it the dual Python 2 and 3 compatibility treatment, as I figure pymake will be ported to Python 3 eventually.

Comment 1

[Mike Hommey [:glandium]]

Comment on attachment 663238 [details] [diff] [review]
Allow unicode through on Python 2, v1

Review of attachment 663238 [details] [diff] [review]:
-----------------------------------------------------------------

::: build/pymake/pymake/data.py
@@ +330,2 @@
>                  fd.write(e)
>                      

Can you remove the whitespaces on this line while you're here?

Comment 2

[Gregory Szorc [:gps]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/531cc108ec41
https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/rev/c1dddeba6db9

Comment 3

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/531cc108ec41