Skip to content
This repository has been archived by the owner on May 1, 2023. It is now read-only.

Commit

Permalink
Fbandroid profilo to Python 3.
Browse files Browse the repository at this point in the history
Summary:
Converts to Python 3.
Generated by running the 2to3 tool over all files that have a py2 pin, and
used sed to remove all py2 pins.
2to3.par --nofix print --nofix future <dir>
And then did a separate search for print " statements and ran the print fix on
them. This was done to prevent the double paren wrapping of print statements to
fixer usually puts in (eg. print(("hello"))
NOTE:This is a codemod. I know nothing about this code, I manually touched only
a handful of these files. If you have questions about how specific code works,
please find an author of the code.

run_all_fbandroid_tests
run_all_fbandroid_tests_at_diff_time
#nocancel

Reviewed By: jiawei-lyu

Differential Revision: D34773781

fbshipit-source-id: 9b60f7955086b40ddac14dc5fd441d95f82a2cd6
lisroach authored and facebook-github-bot committed Mar 14, 2022
1 parent ada6bcd commit 89d9c25
Showing 8 changed files with 21 additions and 33 deletions.
1 change: 0 additions & 1 deletion cpp/codegen/BUCK
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@ fb_python_library(
fb_python_binary(
name = "codegen",
main_module = "profilo.codegen",
platform = "py2",
deps = [
":codegen-lib",
],
8 changes: 2 additions & 6 deletions cpp/codegen/codegen.py
Original file line number Diff line number Diff line change
@@ -26,12 +26,10 @@
SIGNED_SOURCE = "".join(["@", "generated", " ", "SignedSource", "<<>>"])


class Language(object):
class Language(object, metaclass=abc.ABCMeta):
CPP = 1
JAVA = 2

__metaclass__ = abc.ABCMeta

@staticmethod
def is_valid(num):
return num in [Language.CPP, Language.JAVA]
@@ -70,9 +68,7 @@ def __init__(self, **kwargs):
raise ValueError("memory_format must be a MemoryDescription")


class Codegen(object):
__metaclass__ = abc.ABCMeta

class Codegen(object, metaclass=abc.ABCMeta):
@abc.abstractmethod
def generate(self):
pass
6 changes: 5 additions & 1 deletion cpp/codegen/codegen_program.py
Original file line number Diff line number Diff line change
@@ -62,7 +62,11 @@ class CodegenProgram(object):

def __init__(self, lang, mode, entries):
known_codegen = set(
[y for x in CodegenProgram.SUPPORTED_CODEGEN.values() for y in x.keys()]
[
y
for x in list(CodegenProgram.SUPPORTED_CODEGEN.values())
for y in list(x.keys())
]
)

if mode not in known_codegen:
4 changes: 2 additions & 2 deletions cpp/codegen/cpp/entry_structs.py
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ def generate(self):
def _generate_entries_structs(self):

structs = [
self._generate_entry_struct(fmt) for fmt in self.unique_types.values()
self._generate_entry_struct(fmt) for fmt in list(self.unique_types.values())
]

structs = "\n".join(structs)
@@ -148,7 +148,7 @@ def generate(self):
def _generate_entries_code(self):

structs = [
self._generate_entry_struct(fmt) for fmt in self.unique_types.values()
self._generate_entry_struct(fmt) for fmt in list(self.unique_types.values())
]

structs = "\n".join(structs)
6 changes: 4 additions & 2 deletions cpp/codegen/cpp/parser.py
Original file line number Diff line number Diff line change
@@ -82,7 +82,9 @@ class EntryParser {

def _generate_entry_visitor_methods(self):
template = "virtual void visit(const %%TYPE%%& entry) = 0;"
methods = [template.replace("%%TYPE%%", x) for x in self.unique_types.keys()]
methods = [
template.replace("%%TYPE%%", x) for x in list(self.unique_types.keys())
]

return "\n".join(methods)

@@ -109,7 +111,7 @@ def _generate_parse_method(self):
case_template.replace("%%ID%%", str(x.type_id)).replace(
"%%TYPE%%", x.typename
)
for x in self.unique_types.values()
for x in list(self.unique_types.values())
]
cases = "\n".join(cases)
cases = Codegen.indent(cases)
10 changes: 3 additions & 7 deletions cpp/codegen/cpp/type_converters.py
Original file line number Diff line number Diff line change
@@ -30,9 +30,7 @@
from ..types import PointerType


class CppTypeConverter(object):
__metaclass__ = abc.ABCMeta

class CppTypeConverter(object, metaclass=abc.ABCMeta):
def __init__(self, abstract_type):
self.abstract_type = abstract_type

@@ -61,9 +59,7 @@ def generate_runtime_size_code(
)


class PrimitiveTypeConverter(CppTypeConverter):
__metaclass__ = abc.ABCMeta

class PrimitiveTypeConverter(CppTypeConverter, metaclass=abc.ABCMeta):
def generate_pack_code(self, from_expression, to_expression, offset_expr):
return """
std::memcpy(({to}) + {offset}, &({from_}), sizeof(({from_})));
@@ -222,7 +218,7 @@ def generate_declaration(self, name):
}} {name};"""

field_declarations = []
for field_name, field_type in self.abstract_type.members.items():
for field_name, field_type in list(self.abstract_type.members.items()):
decl = CONVERTERS[field_type.__class__](field_type).generate_declaration(
field_name
)
18 changes: 5 additions & 13 deletions cpp/codegen/types.py
Original file line number Diff line number Diff line change
@@ -22,17 +22,13 @@
import abc


class Type(object):
__metaclass__ = abc.ABCMeta

class Type(object, metaclass=abc.ABCMeta):
@abc.abstractproperty
def constant_size(self):
pass


class PrimitiveType(Type):
__metaclass__ = abc.ABCMeta

class PrimitiveType(Type, metaclass=abc.ABCMeta):
@abc.abstractmethod
def __init__(self, size):
super(PrimitiveType, self).__init__()
@@ -72,9 +68,7 @@ def __init__(self, pointed_to_type):
self.pointed_to_type = pointed_to_type


class CompoundType(Type):
__metaclass__ = abc.ABCMeta

class CompoundType(Type, metaclass=abc.ABCMeta):
@abc.abstractmethod
def __init__(self, members):
super(CompoundType, self).__init__()
@@ -83,7 +77,7 @@ def __init__(self, members):

@property
def constant_size(self):
return sum([member.constant_size for member in self.members.values()])
return sum([member.constant_size for member in list(self.members.values())])


class DynamicArrayType(CompoundType):
@@ -101,9 +95,7 @@ def __init__(self, member_type):
self.member_type = member_type


class Types(object):
__metaclass__ = abc.ABCMeta

class Types(object, metaclass=abc.ABCMeta):
int8 = IntegerType(size=1, signed=True)
int16 = IntegerType(size=2, signed=True)
int32 = IntegerType(size=4, signed=True)
1 change: 0 additions & 1 deletion python/profilo/model/tests/BUCK
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ fb_python_test(
srcs = glob(["*.py"]),
base_module = "profilo.model.tests",
contacts = ["oncall+test_ownership_2020@xmail.facebook.com"],
platform = "py2",
deps = [
profilo_path("python/profilo/model:model"),
],

0 comments on commit 89d9c25

Please sign in to comment.