From 0b94cdc3be0d8886f1ce08a102f15e7de89968d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Barbier?= Date: Wed, 1 Apr 2015 15:56:40 +0200 Subject: [PATCH] fixed duplicate imports du to rebasing against master --- webapp/graphite/render/functions.py | 4 +--- webapp/tests/test_functions.py | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/webapp/graphite/render/functions.py b/webapp/graphite/render/functions.py index c4259558f..af682d2ca 100644 --- a/webapp/graphite/render/functions.py +++ b/webapp/graphite/render/functions.py @@ -24,7 +24,7 @@ from graphite.logger import log from graphite.render.attime import parseTimeOffset, parseATTime from graphite.events import models -from graphite.util import epoch +from graphite.util import epoch, timestamp, deltaseconds # XXX format_units() should go somewhere else if environ.get('READTHEDOCS'): @@ -33,8 +33,6 @@ from graphite.render.glyph import format_units from graphite.render.datalib import TimeSeries -from graphite.util import epoch, timestamp, deltaseconds - NAN = float('NaN') INF = float('inf') DAY = 86400 diff --git a/webapp/tests/test_functions.py b/webapp/tests/test_functions.py index 93af318ca..cd507602a 100644 --- a/webapp/tests/test_functions.py +++ b/webapp/tests/test_functions.py @@ -1,7 +1,6 @@ import copy import math import pytz -from datetime import datetime from fnmatch import fnmatch from django.test import TestCase