From 492a25dc47b4eb694b961a8227f7b21b3d2c09db Mon Sep 17 00:00:00 2001 From: David Hoese <david.hoese@ssec.wisc.edu> Date: Sat, 6 Oct 2018 20:12:19 -0500 Subject: [PATCH] Start initial migration to new metobscommon and python 3 interface --- aossceilo/nc.py | 13 +++++-------- aossceilo/tidy.py | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/aossceilo/nc.py b/aossceilo/nc.py index e16e3cc..ad149ba 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 95035eb..71d75af 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 -- GitLab