external/proxstar
1
0
Fork 0
mirror of https://github.com/ComputerScienceHouse/proxstar.git synced 2025-03-09 15:40:09 +00:00
Code Issues Releases Wiki Activity

Fix all incorrect imports

Browse source
This commit is contained in:
Galen Guyer 2019-11-01 17:03:35 -04:00
parent c6b6b8e38c
commit 0771e1343a
No known key found for this signature in database
GPG key ID: 6E39D00D77389D4E
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
proxstar/__init__.py
View file

@ -14,7 +14,8 @@ from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker from sqlalchemy.orm import sessionmaker
from flask import Flask, render_template, request, redirect, session, abort, url_for from flask import Flask, render_template, request, redirect, session, abort, url_for
from proxstar.db import (Base, datetime, get_pool_cache, renew_vm_expire, set_user_usage_limits, get_template, from proxstar.db import (Base, datetime, get_pool_cache, renew_vm_expire, set_user_usage_limits, get_template,
get_templates, get_allowed_users, add_ignored_pool, delete_ignored_pool, add_allowed_user, delete_allowed_user, get_templates, get_allowed_users, add_ignored_pool, delete_ignored_pool, add_allowed_user,
delete_allowed_user,
get_template_disk, set_template_info) get_template_disk, set_template_info)
from proxstar.vnc import (send_stop_ssh_tunnel, stop_ssh_tunnel, add_vnc_target, start_ssh_tunnel, get_vnc_targets, from proxstar.vnc import (send_stop_ssh_tunnel, stop_ssh_tunnel, add_vnc_target, start_ssh_tunnel, get_vnc_targets,
delete_vnc_target, stop_websockify) delete_vnc_target, stop_websockify)

3
proxstar/user.py
View file

@ -1,8 +1,9 @@
from proxmoxer.core import ResourceException from proxmoxer.core import ResourceException
from rq.registry import StartedJobRegistry from rq.registry import StartedJobRegistry
from proxstar.ldapdb import is_active, is_user, is_current_student
from proxstar import db, q, redis_conn from proxstar import db, q, redis_conn
from proxstar.db import get_allowed_users, is_active, is_current_student, is_rtp, is_user, get_user_usage_limits from proxstar.db import get_allowed_users, get_user_usage_limits, is_rtp
from proxstar.proxmox import connect_proxmox, get_pools from proxstar.proxmox import connect_proxmox, get_pools
from proxstar.util import lazy_property from proxstar.util import lazy_property
from proxstar.vm import VM from proxstar.vm import VM