Skip to content

Commit

Permalink
Upgrade to csvkit 1.0, lock reqs into this version
Browse files Browse the repository at this point in the history
  • Loading branch information
gordonje committed Dec 27, 2016
1 parent bc14656 commit f9b7899
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions calaccess_raw/management/commands/cleancalaccessrawfile.py
Expand Up @@ -12,7 +12,7 @@
from django.core.management.base import CommandError
from django.utils import six
from django.utils.timezone import now
from csvkit import CSVKitReader, CSVKitWriter
from csvkit import reader, writer
from calaccess_raw import get_download_directory
from calaccess_raw.management.commands import CalAccessCommand
from calaccess_raw.models.tracking import RawDataVersion, RawDataFile
Expand Down Expand Up @@ -120,15 +120,15 @@ def clean(self):

# Writer
csv_file = open(csv_path, 'w')
csv_writer = CSVKitWriter(csv_file)
csv_writer = writer(csv_file)

# Pull and clean the headers
try:
headers = tsv_file.readline()
except StopIteration:
return
headers = headers.decode("ascii", "replace")
headers_csv = CSVKitReader(StringIO(headers), delimiter=str('\t'))
headers_csv = reader(StringIO(headers), delimiter=str('\t'))
try:
headers_list = next(headers_csv)
except StopIteration:
Expand Down Expand Up @@ -179,7 +179,7 @@ def clean(self):
# Check if our values line up with our headers
# and if not, see if CSVkit can sort out the problems
if not len(csv_field_list) == headers_count:
csv_field_list = next(CSVKitReader(
csv_field_list = next(reader(
StringIO(tsv_line),
delimiter=str('\t')
))
Expand Down Expand Up @@ -260,7 +260,7 @@ def log_errors(self, rows):

# Log writer
log_file = open(self.error_log_path, 'w')
log_writer = CSVKitWriter(log_file, quoting=csv.QUOTE_ALL)
log_writer = writer(log_file, quoting=csv.QUOTE_ALL)

# Add the headers
log_writer.writerow([
Expand Down
4 changes: 2 additions & 2 deletions calaccess_raw/management/commands/loadcalaccessrawfile.py
Expand Up @@ -7,7 +7,7 @@
import os
import six
from django.apps import apps
from csvkit import CSVKitReader
from csvkit import reader
from django.conf import settings
from postgres_copy import CopyMapping
from django.db import connections, router
Expand Down Expand Up @@ -300,7 +300,7 @@ def get_headers(self):
Returns the column headers from the csv as a list.
"""
with open(self.csv, 'r') as infile:
csv_reader = CSVKitReader(infile)
csv_reader = reader(infile)
try:
headers = next(csv_reader)
except StopIteration:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Expand Up @@ -5,7 +5,7 @@ hurry.filesize
pytz
requests
clint
csvkit
csvkit==1.0

# Databases
mysqlclient
Expand Down

0 comments on commit f9b7899

Please sign in to comment.