Commitde292f0

authored

Merge pull requestdropbox#182 from cakoose/py3

Make build and helper script work under Python 3.

2 parents81c01e3 +9e825cd commitde292f0Copy full SHA for de292f0

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,9 @@`
`48`	`48`	`)`
`49`	`49`	`fromstone.backendimportCodeBackend`
`50`	`50`
	`51`	`+@six.add_metaclass(abc.ABCMeta)`
`51`	`52`	`classStoneType:`
`52`		`-__metaclass__=abc.ABCMeta`
	`53`	`+pass`
`53`	`54`
`54`	`55`	`StoneType.register(ApiNamespace)`
`55`	`56`	`StoneType.register(ApiRoute)`
`@@ -2265,7 +2266,7 @@ def __str__(self):`
`2265`	`2266`
`2266`	`2267`	`def_as_json(self):`
`2267`	`2268`	`dct= {}`
`2268`		`-fork,vinself.__dict__.iteritems():`
	`2269`	`+fork,vinself.__dict__.items():`
`2269`	`2270`	`# avoid cyclic references issue`
`2270`	`2271`	`ifisinstance(v,JavaReference):`
`2271`	`2272`	`dct[k]=v.fq_name`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ def get_files_in_repo(repo_path, exclude_ignored_files=False):`
`79`	`79`	`ignored_files=subprocess.check_output(command,cwd=repo_path).split()`
`80`	`80`	`else:`
`81`	`81`	`ignored_files= []`
`82`		`-return [fileforfileinfiles_listiffilenotinignored_files]`
	`82`	`+return [file.decode('utf8')forfileinfiles_listiffilenotinignored_files]`
`83`	`83`
`84`	`84`	`defstrip_private_sections(path):`
`85`	`85`	`"""Delete everything in the file between the private repo tags"""`
`@@ -121,7 +121,7 @@ def main():`
`121`	`121`	`"""The entry point for the program."""`
`122`	`122`
`123`	`123`	`args=_cmdline_parser.parse_args()`
`124`		`-cwd=os.path.dirname(os.path.dirname(__file__))`
	`124`	`+cwd=os.path.dirname(os.path.dirname(os.path.abspath(__file__)))`
`125`	`125`	`repo_path=args.repo_path`
`126`	`126`	`deflog(msg):`
`127`	`127`	`ifargs.verbose:`

Comments

(0)