Merge pull request #1244 from nabobalis/master

 Sprint: Deprecate python 2.6

doc/source/code_ref/util.rst

@@ -7,8 +7,6 @@ SunPy util
 
 .. automodapi:: sunpy.util.config
 
-.. automodapi:: sunpy.util.counter
-
 .. automodapi:: sunpy.util.create
 
 .. automodapi:: sunpy.util.datatype_factory_base
@@ -17,9 +15,6 @@ SunPy util
 
 .. automodapi:: sunpy.util.net
 
-.. automodapi:: sunpy.util.odict
-
 .. automodapi:: sunpy.util.progressbar
 
 .. automodapi:: sunpy.util.xml
-

sunpy/database/caching.py

@@ -6,10 +6,7 @@
 from __future__ import absolute_import
 
 from abc import ABCMeta, abstractmethod, abstractproperty
-from collections import MutableMapping
-
-from sunpy.util.odict import OrderedDict
-from sunpy.util.counter import Counter
+from collections import MutableMapping, OrderedDict, Counter
 
 __all__ = ['BaseCache', 'LRUCache', 'LFUCache']
 

sunpy/io/header.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
-from sunpy.util.odict import OrderedDict
+from collections import OrderedDict
 
 __all__ = ['FileHeader']
 

sunpy/lightcurve/lightcurve.py

@@ -13,6 +13,7 @@
 import urllib2
 import warnings
 from datetime import datetime
+from collections import OrderedDict
 
 import numpy as np
 import matplotlib.pyplot as plt
@@ -21,7 +22,6 @@
 from sunpy import config
 from sunpy.time import is_time, TimeRange, parse_time
 from sunpy.util.cond_dispatch import ConditionalDispatch, run_cls
-from sunpy.util.odict import OrderedDict
 
 __all__ = ['LightCurve']
 

sunpy/lightcurve/sources/eve.py

@@ -5,13 +5,13 @@
 import os
 import numpy
 from datetime import datetime
+from collections import OrderedDict
 
 import matplotlib.pyplot as plt
 from pandas.io.parsers import read_csv
 from os.path import basename
 
 from sunpy.lightcurve import LightCurve
-from sunpy.util.odict import OrderedDict
 
 __all__ = ['EVELightCurve']
 

sunpy/lightcurve/sources/lyra.py

@@ -5,14 +5,14 @@
 import datetime
 import urlparse
 import sys
+from collections import OrderedDict
 
 from matplotlib import pyplot as plt
 from astropy.io import fits
 import pandas
 
 from sunpy.lightcurve import LightCurve
 from sunpy.time import parse_time
-from sunpy.util.odict import OrderedDict
 
 from sunpy import config
 TIME_FORMAT = config.get("general", "time_format")

sunpy/lightcurve/sources/norh.py

@@ -4,6 +4,8 @@
 
 import datetime
 import urlparse
+from collections import OrderedDict
+
 import numpy as np
 import matplotlib.pyplot as plt
 
@@ -12,7 +14,6 @@
 
 from sunpy.lightcurve import LightCurve
 from sunpy.time import parse_time
-from sunpy.util.odict import OrderedDict
 
 from sunpy import config
 TIME_FORMAT = config.get("general", "time_format")

sunpy/map/header.py

@@ -4,7 +4,7 @@
 """
 from __future__ import absolute_import
 
-from sunpy.util.odict import OrderedDict
+from collections import OrderedDict
 
 __all__ = ['MapMeta']
 

sunpy/util/compat/_funcsigs.py

@@ -12,7 +12,7 @@
 import re
 import types
 
-from astropy.utils.compat.odict import OrderedDict
+from collections import OrderedDict
 
 __all__ = ['BoundArguments', 'Parameter', 'Signature', 'signature']