from corehq.util.spreadsheets.excel import IteratorJSONReader
from test_couch import *
from test_log import *
from test_toggle import *
from test_quickcache import *
from test_timezone_conversions import *
from test_soft_assert import *
from test_cache_util import *
from test_override_db import *
from test_spreadsheets import *
from test_jsonobject import *
from test_xml import *
from test_couchdb_management import *

from corehq.util.dates import iso_string_to_datetime, iso_string_to_date

__test__ = {
    'iso_string_to_datetime': iso_string_to_datetime,
    'iso_string_to_date': iso_string_to_date,
    'jsonreader': IteratorJSONReader,
}

@@ -2,64 +2,32 @@
 rom 
-corehq.util.spreadsheets.excel import IteratorJSONReader
+test_cache_util import *
 %0Afro
@@ -62,11 +62,26 @@
 est_
-log
+couchdb_management
  imp
@@ -100,14 +100,18 @@
 est_
-toggle
+jsonobject
  imp
@@ -130,18 +130,11 @@
 est_
-quickcache
+log
  imp
@@ -153,28 +153,19 @@
 est_
-timezone_conversions
+override_db
  imp
@@ -184,19 +184,18 @@
 est_
-soft_assert
+quickcache
  imp
@@ -206,34 +206,35 @@
 *%0Afrom test_
-cache_util
+soft_assert
  import *%0Afr
@@ -237,35 +237,36 @@
 *%0Afrom test_
-override_db
+spreadsheets
  import *%0Afr
@@ -269,35 +269,43 @@
 *%0Afrom test_
-spreadsheet
+timezone_conversion
 s import *%0Af
@@ -309,34 +309,30 @@
 *%0Afrom test_
-jsonobject
+toggle
  import *%0Afr
@@ -356,46 +356,70 @@
 t *%0A
+%0A
 from 
-test_couchdb_management import *%0A
+corehq.util.spreadsheets.excel import IteratorJSONReader
 %0Afro

rearrange util test imports