From aced449c1de7d7cd90e1e46fd4eb973f93bbdc3f Mon Sep 17 00:00:00 2001
From: Rob Young <rob.young@digital.cabinet-office.gov.uk>
Date: Tue, 30 Jul 2013 22:54:31 +0000
Subject: [PATCH] Rename parsing package to upload

To avoid confusion with query parsing and record value parsing.
---
 backdrop/core/{parsing => upload}/__init__.py      | 1 -
 backdrop/core/{parsing => upload}/parse_csv.py     | 0
 backdrop/core/{parsing => upload}/parse_excel.py   | 0
 backdrop/core/{parsing => upload}/utils.py         | 0
 backdrop/write/admin_ui.py                         | 2 +-
 tests/core/{parsing => upload}/__init__.py         | 0
 tests/core/{parsing => upload}/test_parse_csv.py   | 2 +-
 tests/core/{parsing => upload}/test_parse_excel.py | 2 +-
 tests/core/{parsing => upload}/test_parsing.py     | 2 +-
 9 files changed, 4 insertions(+), 5 deletions(-)
 rename backdrop/core/{parsing => upload}/__init__.py (99%)
 rename backdrop/core/{parsing => upload}/parse_csv.py (100%)
 rename backdrop/core/{parsing => upload}/parse_excel.py (100%)
 rename backdrop/core/{parsing => upload}/utils.py (100%)
 rename tests/core/{parsing => upload}/__init__.py (100%)
 rename tests/core/{parsing => upload}/test_parse_csv.py (98%)
 rename tests/core/{parsing => upload}/test_parse_excel.py (95%)
 rename tests/core/{parsing => upload}/test_parsing.py (96%)

diff --git a/backdrop/core/parsing/__init__.py b/backdrop/core/upload/__init__.py
similarity index 99%
rename from backdrop/core/parsing/__init__.py
rename to backdrop/core/upload/__init__.py
index 136e219d..a6ae5c5c 100644
--- a/backdrop/core/parsing/__init__.py
+++ b/backdrop/core/upload/__init__.py
@@ -32,4 +32,3 @@ def load_filter(filter_name):
         fromlist=filter_name.rsplit(".", 1)[0])
 
     return getattr(module, func_name)
-
diff --git a/backdrop/core/parsing/parse_csv.py b/backdrop/core/upload/parse_csv.py
similarity index 100%
rename from backdrop/core/parsing/parse_csv.py
rename to backdrop/core/upload/parse_csv.py
diff --git a/backdrop/core/parsing/parse_excel.py b/backdrop/core/upload/parse_excel.py
similarity index 100%
rename from backdrop/core/parsing/parse_excel.py
rename to backdrop/core/upload/parse_excel.py
diff --git a/backdrop/core/parsing/utils.py b/backdrop/core/upload/utils.py
similarity index 100%
rename from backdrop/core/parsing/utils.py
rename to backdrop/core/upload/utils.py
diff --git a/backdrop/write/admin_ui.py b/backdrop/write/admin_ui.py
index 4adfe762..f2e37c00 100644
--- a/backdrop/write/admin_ui.py
+++ b/backdrop/write/admin_ui.py
@@ -4,7 +4,7 @@
 from admin_ui_helper import url_for
 from backdrop.core.bucket import Bucket
 from backdrop.core.errors import ParseError, ValidationError
-from backdrop.core.parsing import create_parser
+from backdrop.core.upload import create_parser
 from backdrop.write.signonotron2 import Signonotron2
 
 
diff --git a/tests/core/parsing/__init__.py b/tests/core/upload/__init__.py
similarity index 100%
rename from tests/core/parsing/__init__.py
rename to tests/core/upload/__init__.py
diff --git a/tests/core/parsing/test_parse_csv.py b/tests/core/upload/test_parse_csv.py
similarity index 98%
rename from tests/core/parsing/test_parse_csv.py
rename to tests/core/upload/test_parse_csv.py
index 2398f682..4fc538f0 100644
--- a/tests/core/parsing/test_parse_csv.py
+++ b/tests/core/upload/test_parse_csv.py
@@ -4,7 +4,7 @@
 import unittest
 from hamcrest import assert_that, only_contains, is_, contains
 
-from backdrop.core.parsing.parse_csv import parse_csv, lines
+from backdrop.core.upload.parse_csv import parse_csv, lines
 from backdrop.core.errors import ParseError
 
 
diff --git a/tests/core/parsing/test_parse_excel.py b/tests/core/upload/test_parse_excel.py
similarity index 95%
rename from tests/core/parsing/test_parse_excel.py
rename to tests/core/upload/test_parse_excel.py
index 6e43aa83..dce242fe 100644
--- a/tests/core/parsing/test_parse_excel.py
+++ b/tests/core/upload/test_parse_excel.py
@@ -2,7 +2,7 @@
 from hamcrest import assert_that, only_contains, contains
 from backdrop.core.errors import ParseError
 
-from backdrop.core.parsing.parse_excel import parse_excel
+from backdrop.core.upload.parse_excel import parse_excel
 from tests.support.test_helpers import fixture_path, d_tz
 
 
diff --git a/tests/core/parsing/test_parsing.py b/tests/core/upload/test_parsing.py
similarity index 96%
rename from tests/core/parsing/test_parsing.py
rename to tests/core/upload/test_parsing.py
index 98f48df0..73bb6a82 100644
--- a/tests/core/parsing/test_parsing.py
+++ b/tests/core/upload/test_parsing.py
@@ -1,7 +1,7 @@
 import unittest
 from hamcrest import only_contains, assert_that
 from backdrop.core.errors import ParseError
-from backdrop.core.parsing.utils import make_records
+from backdrop.core.upload.utils import make_records
 
 
 class TestMakeRecords(unittest.TestCase):