Skip to content

Make build and helper script work under Python 3. #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
risforrob merged 1 commit into from
Mar 8, 2018
Merged

Make build and helper script work under Python 3. #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions generator/java.stoneg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@
)
from stone.backend import CodeBackend

@six.add_metaclass(abc.ABCMeta)
class StoneType:
__metaclass__ = abc.ABCMeta
pass

StoneType.register(ApiNamespace)
StoneType.register(ApiRoute)
Expand Down Expand Up @@ -2265,7 +2266,7 @@ def __str__(self):

def _as_json(self):
dct = {}
for k, v in self.__dict__.iteritems():
for k, v in self.__dict__.items():
# avoid cyclic references issue
if isinstance(v, JavaReference):
dct[k] = v.fq_name
Expand Down
4 changes: 2 additions & 2 deletions scripts/export-generated
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def get_files_in_repo(repo_path, exclude_ignored_files=False):
ignored_files = subprocess.check_output(command, cwd=repo_path).split()
else:
ignored_files = []
return [file for file in files_list if file not in ignored_files]
return [file.decode('utf8') for file in files_list if file not in ignored_files]

def strip_private_sections(path):
"""Delete everything in the file between the private repo tags"""
Expand Down Expand Up @@ -121,7 +121,7 @@ def main():
"""The entry point for the program."""

args = _cmdline_parser.parse_args()
cwd = os.path.dirname(os.path.dirname(__file__))
cwd = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
repo_path = args.repo_path
def log(msg):
if args.verbose:
Expand Down