Skip to content

python 3 compatibility #1

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
filippocastelli wants to merge 3 commits into
base: master
Choose a base branch
from
Open

python 3 compatibility #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6021b77
print usage if no args are used
filippocastelli Apr 23, 2020
2d8f97c
python3 compatibility
filippocastelli Apr 23, 2020
16facda
python2/3 compatibility for _ximage_index_connect
filippocastelli Apr 23, 2020
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: 13 additions & 3 deletions ximage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from datetime import datetime
from string import Template
import pickle
from functools import reduce

XMP_NS_ALIQUIS = 'http://bioretics.com/aliquis'

Expand Down Expand Up @@ -361,7 +362,7 @@ def build_hierarchy(blobs_children, parent):
for root in roots:
parent.children.append(root)
build_hierarchy(blobs_children, root)

mask = cv2.imread(args.mask, -1)

# Count number of classes
Expand Down Expand Up @@ -565,7 +566,11 @@ def _ximage_index_connect(args, create=False):
sqlite3.register_converter('uuid', lambda buf: UUID(bytes=buf))
sqlite3.register_adapter(XValue, lambda x: pickle.dumps(x.val))
sqlite3.register_adapter(np.ndarray, lambda a: np.getbuffer(a))
sqlite3.register_adapter(UUID, lambda uuid: buffer(uuid.get_bytes()))

if sys.version_info[0] == 2:
sqlite3.register_adapter(UUID, lambda uuid: buffer(uuid.get_bytes()))
else:
sqlite3.register_adapter(UUID, lambda uuid: memoryview(uuid.get_bytes()))

index_path = os.path.join(args.root, '.ximage-index.db')
if not create:
Expand Down Expand Up @@ -914,7 +919,12 @@ def ximage_main(prog_name='ximage'):
parser_stats = subparsers.add_parser('stats', help='Show some indexed directory statistics')
parser_stats.add_argument('-D', '--root', type=str, required=False, default=os.getcwd(), help='Root directory path (default: cwd)')
parser_stats.set_defaults(func=ximage_stats)


# print usage if no args are used
if len(sys.argv) == 1:
parser.print_help(sys.stderr)
sys.exit(1)

args = parser.parse_args()
sys.exit(args.func(args))

Expand Down