fixed duplicate imports du to rebasing against master

graphite-project · May 18, 2016 · 0b94cdc · 0b94cdc
1 parent 2226461
commit 0b94cdc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -1,7 +1,6 @@
 import copy
 import math
 import pytz
-from datetime import datetime
 from fnmatch import fnmatch
 
 from django.test import TestCase