diff --git a/aossceilo/nc.py b/aossceilo/nc.py index e16e3ccd423702290eadf5fc1e70761e147e9cff..ad149ba36a5c273402cc4e594a9b2ba70fe97aef 100644 --- a/aossceilo/nc.py +++ b/aossceilo/nc.py @@ -8,20 +8,17 @@ __docformat__ = 'Epytext' from os import path, makedirs import logging -from time import gmtime from calendar import timegm from datetime import datetime, timedelta -from urllib2 import HTTPError#, urlopen import pkg_resources from numpy import array, zeros, int32, int8, uint16 -from pycdf import NC -from metobs import mytime -from metobs.util.gen_open import open_ascii as urlopen -from metobs.util.nc import create_nc_from_ncml -from metobs.ceilo.CONFIG import get_ascii_url, get_nc_filename, get_cache_dir as _get_destination_dir -from message import Message2, load_messages +from metobscommon.util import mytime +from metobscommon.util.gen_open import open_ascii as urlopen +from metobscommon.util.legacy_nc import create_nc_from_ncml +from aossceilo.CONFIG import get_ascii_url, get_nc_filename, get_cache_dir as _get_destination_dir +from .message import load_messages #: valid RIG ceilometer variables _ceilo_variables = [ diff --git a/aossceilo/tidy.py b/aossceilo/tidy.py index 95035eb616d5404ae2dc2f82ee607443f90baab7..71d75af047ae51d794494db5c88eca5f0dffdad0 100644 --- a/aossceilo/tidy.py +++ b/aossceilo/tidy.py @@ -26,7 +26,7 @@ from subprocess import check_call as sh from datetime import datetime, timedelta from metobs.ceilo import quicklook, nc from metobs.ceilo import CONFIG as c -from metobs.util import raw_manager +from metobscommon.util import raw_manager rel = raw_manager.relativedir import re