Skip to content

Convert to Python3 #8

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

Open
ralic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Convert to Python3 #8

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
16 changes: 8 additions & 8 deletions almonds/almonds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/python
# -*- encoding: utf-8 -*-

from __future__ import print_function
from __future__ import division



import os
import sys
Expand Down Expand Up @@ -68,8 +68,8 @@ def draw_panel(cb, pool, params, plane):
missing_coords = []

# Check for coordinates that have no value in current plane
xs = range(params.plane_x0, params.plane_x0 + params.plane_w - 1)
ys = range(params.plane_y0, params.plane_y0 + params.plane_h - 1)
xs = list(range(params.plane_x0, params.plane_x0 + params.plane_w - 1))
ys = list(range(params.plane_y0, params.plane_y0 + params.plane_h - 1))
for x in xs:
for y in ys:
if plane[x, y] is None:
Expand Down Expand Up @@ -262,12 +262,12 @@ def save(params):
import pickle
cPickle = pickle
else:
import cPickle
import pickle
ts = datetime.datetime.fromtimestamp(time.time()).strftime("%Y-%m-%d_%H-%M-%S")
if not os.path.exists("saves/"):
os.makedirs("saves/")
with open("saves/almonds_%s.params" % ts, "wb") as f:
cPickle.dump(params, f)
pickle.dump(params, f)
params.log("Current scene saved!")


Expand Down Expand Up @@ -402,10 +402,10 @@ def load(path):
import pickle
cPickle = pickle
else:
import cPickle
import pickle

with open(path, "rb") as f:
params = cPickle.load(f)
params = pickle.load(f)
params.log = log
log("Save loaded!")
return params
Expand Down
Loading