diff --git a/marmoset/webserver/dhcp.py b/marmoset/webserver/dhcp.py index 14251fc..260b8ff 100644 --- a/marmoset/webserver/dhcp.py +++ b/marmoset/webserver/dhcp.py @@ -1,9 +1,6 @@ """File to handle all web interaction with DHCP records.""" from flask import request -from flask.ext.restful import Resource -from flask.ext.restful import abort -from flask.ext.restful import reqparse -from flask.ext.restful import url_for +from flask_restful import Resource, abort, reqparse, url_for from marmoset import config as config_reader from marmoset import dhcp diff --git a/marmoset/webserver/imagecatalog.py b/marmoset/webserver/imagecatalog.py index 5c80578..09a4223 100644 --- a/marmoset/webserver/imagecatalog.py +++ b/marmoset/webserver/imagecatalog.py @@ -1,5 +1,5 @@ """Class for handling image metadata.""" -from flask.ext.restful import Resource, abort +from flask_restful import Resource, abort from ..imagecatalog.catalog import ImageCatalog diff --git a/marmoset/webserver/installimage.py b/marmoset/webserver/installimage.py index 6e9280b..6002949 100644 --- a/marmoset/webserver/installimage.py +++ b/marmoset/webserver/installimage.py @@ -1,6 +1,6 @@ """File to handle all web interaction with installimage configurations.""" from flask import request, make_response -from flask.ext.restful import Resource, url_for, abort +from flask_restful import Resource, url_for, abort from ..installimage.installimage_config import InstallimageConfig from ..installimage.req_argument_parser import ReqArgumentParser diff --git a/marmoset/webserver/installstatus.py b/marmoset/webserver/installstatus.py index 72129d3..0bb0723 100644 --- a/marmoset/webserver/installstatus.py +++ b/marmoset/webserver/installstatus.py @@ -1,5 +1,5 @@ """handle all web interaction with status updates from our installimage.""" -from flask.ext.restful import reqparse, Resource, abort +from flask_restful import reqparse, Resource, abort from flask import request from marmoset.installstatus import InstallStatus from marmoset import validation diff --git a/marmoset/webserver/pxe.py b/marmoset/webserver/pxe.py index 3c13b2f..90d6481 100644 --- a/marmoset/webserver/pxe.py +++ b/marmoset/webserver/pxe.py @@ -1,5 +1,5 @@ """File to handle all web interaction with PXE records.""" -from flask.ext.restful import reqparse, Resource, url_for, abort +from flask_restful import reqparse, Resource, url_for, abort from .. import pxe from marmoset import config as config_reader diff --git a/marmoset/webserver/vm.py b/marmoset/webserver/vm.py index 1d29676..bb87ef9 100644 --- a/marmoset/webserver/vm.py +++ b/marmoset/webserver/vm.py @@ -1,5 +1,5 @@ """File to handle all web interaction with virtual machines.""" -from flask.ext.restful import reqparse, Resource, abort +from flask_restful import reqparse, Resource, abort from .. import virt diff --git a/setup.py b/setup.py index 33d10b2..5557d72 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ def read(fname): setup( name='marmoset', - version='0.7.0', + version='0.7.1', description='Simple HTTP API for managing stuff on libvirt hosts', keywords='dhcp dhcpd ldap libvirt management vms virtual-machines', author='https://github.com/virtapi/marmoset/graphs/contributors',