Commit a955b391 authored by Marcin Pawlowski's avatar Marcin Pawlowski Committed by woo

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
parent 8c74c806
...@@ -79,10 +79,10 @@ def generate(f): ...@@ -79,10 +79,10 @@ def generate(f):
# 4 = always percent-encode # 4 = always percent-encode
f.write("extern const unsigned char uriEscapeTable[] = {") f.write("extern const unsigned char uriEscapeTable[] = {")
passthrough = ( passthrough = (
range(ord('0'), ord('9')) + list(range(ord('0'), ord('9'))) +
range(ord('A'), ord('Z')) + list(range(ord('A'), ord('Z'))) +
range(ord('a'), ord('z')) + list(range(ord('a'), ord('z'))) +
map(ord, '-_.~')) list(map(ord, '-_.~')))
for i in range(0, 256): for i in range(0, 256):
if i % 16 == 0: if i % 16 == 0:
f.write("\n ") f.write("\n ")
......
...@@ -33,14 +33,14 @@ def generate_conv_table(f, name, values): ...@@ -33,14 +33,14 @@ def generate_conv_table(f, name, values):
f.write("};\n\n") f.write("};\n\n")
def octal_values(): 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): def hex_values(upper):
fmt = "{0:02X}" if upper else "{0:02x}" 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(): 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): def generate(f):
f.write("#include <folly/FormatArg.h>\n" f.write("#include <folly/FormatArg.h>\n"
......
*.log *.log
*.trs *.trs
gtest*/*
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment