From a955b391aecb569f68b05bf216e0014a30ddb6cb Mon Sep 17 00:00:00 2001 From: Marcin Pawlowski Date: Mon, 26 Jan 2015 13:57:21 -0800 Subject: [PATCH] fix folly build under python 3 Summary: Make python scripts compatible woth both python 3 and python 2. Added ignore rule for test/glog directory. Facebook: While verifying some issues reported on github i noticed that folly does not build when python 3 is the default (at least on arch linux). As it turns out it is fairly easy to make our python files compatible with both python 2 and python 3. I also added test/glog*/* to gitignore so that it is easier to work on folly outside of facebook. Test Plan: unit tests in fb envirnoment and unit test on arch linux (python 3.4.2, gcc 4.9.2) Reviewed By: njormrod@fb.com Subscribers: trunkagent, folly-diffs@ FB internal diff: D1801368 Signature: t1:1801368:1422294777:4e7b6b5634e8dccd849194e171c9a342bd1cb8b8 --- folly/build/generate_escape_tables.py | 8 ++++---- folly/build/generate_format_tables.py | 6 +++--- folly/test/.gitignore | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/folly/build/generate_escape_tables.py b/folly/build/generate_escape_tables.py index 0d18978e..03df62a3 100755 --- a/folly/build/generate_escape_tables.py +++ b/folly/build/generate_escape_tables.py @@ -79,10 +79,10 @@ def generate(f): # 4 = always percent-encode f.write("extern const unsigned char uriEscapeTable[] = {") passthrough = ( - range(ord('0'), ord('9')) + - range(ord('A'), ord('Z')) + - range(ord('a'), ord('z')) + - map(ord, '-_.~')) + list(range(ord('0'), ord('9'))) + + list(range(ord('A'), ord('Z'))) + + list(range(ord('a'), ord('z'))) + + list(map(ord, '-_.~'))) for i in range(0, 256): if i % 16 == 0: f.write("\n ") diff --git a/folly/build/generate_format_tables.py b/folly/build/generate_format_tables.py index c4255eca..45abc4ca 100755 --- a/folly/build/generate_format_tables.py +++ b/folly/build/generate_format_tables.py @@ -33,14 +33,14 @@ def generate_conv_table(f, name, values): f.write("};\n\n") def octal_values(): - return (tuple("{0:03o}".format(x)) for x in xrange(512)) + return (tuple("{0:03o}".format(x)) for x in range(512)) def hex_values(upper): fmt = "{0:02X}" if upper else "{0:02x}" - return (tuple(fmt.format(x)) for x in xrange(256)) + return (tuple(fmt.format(x)) for x in range(256)) def binary_values(): - return (tuple("{0:08b}".format(x)) for x in xrange(256)) + return (tuple("{0:08b}".format(x)) for x in range(256)) def generate(f): f.write("#include \n" diff --git a/folly/test/.gitignore b/folly/test/.gitignore index 7e563b8b..baa95bca 100644 --- a/folly/test/.gitignore +++ b/folly/test/.gitignore @@ -1,2 +1,3 @@ *.log *.trs +gtest*/* -- 2.34.1