Skip to content
This repository has been archived by the owner on Jan 16, 2023. It is now read-only.

Python 2/3 Support #22

Merged
merged 7 commits into from
Mar 8, 2014
Merged

Python 2/3 Support #22

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
692bd16
Python 2/3 support for command line input
archen Feb 16, 2014
fde7285
Python 2/3 support for md5 path encoding
archen Feb 16, 2014
81afa67
added comments for better identification of proposed changes
archen Feb 16, 2014
3420973
Update setup.py
archen Feb 17, 2014
5cd3965
Removed environment specific ignores.
archen Mar 6, 2014
4e8aaad
Update setup.py
archen Mar 6, 2014
6c7d9ca
changed input function import to match the style used by core Django.…
archen Mar 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions collectfast/management/commands/collectstatic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# -*- coding: utf-8 -*-

from __future__ import with_statement

# Python 2/3 support for command line input
from django.utils.six.moves import input

import hashlib
from optparse import make_option
import datetime
Expand Down Expand Up @@ -35,7 +39,11 @@ def collect(self, *args, **kwargs):
return ret

def get_cache_key(self, path):
return 'collectfast_asset_' + hashlib.md5(path).hexdigest()
# Python 2/3 support for path hashing
try:
return 'collectfast_asset_' + hashlib.md5(path).hexdigest()
except TypeError:
return 'collectfast_asset_' + hashlib.md5(path.encode('utf-8')).hexdigest()

def get_lookup(self, path):
"""Get lookup from local dict, cache or S3 — in that order"""
Expand Down Expand Up @@ -120,7 +128,7 @@ def handle_noargs(self, **options):
clear_display = 'This will overwrite existing files!'

if self.interactive:
confirm = raw_input(u"""
confirm = input(u"""
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code is copied straight from Django itself so I'd rather maintain it being as similar as possible to Django. I am not sure what the differences between raw_input and input are though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The big difference is raw_input doesn't exist in Python 3.x. Which Django module did you pull this code from? I'd be interested in seeing how they handle this issue for Py2/3 compatibility.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's from here: https://github.com/django/django/blob/stable/1.4.x/django/contrib/staticfiles/management/commands/collectstatic.py

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to update the code so that it reflects the latest stable version of Django, I'd be fine with that. Alternatively, if you'd be able to modify the output in a cleaner way without duplicating all the code, that'd be preferable ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When you say modify the output, you mean try to find a way to override the output message in the function provided by Django 1.6+'s collectstatic?

It looks like they import 'input' from the included six utility in Django 1.6. If I can't figure out the DRYest way of doing it, I'll just remove the logic up top that looks for the built-in and use the six module instead.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's what I meant.

Cool, just make sure it's compatible with 1.4.x as well 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason that you're declaring this function anyway? I don't see anything collectfast specific happening in handle_noargs. Why override at all?

edit: I removed handle_noargs entirely from a local branch and collectstatic still behaves as expected.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To output the number of skipped files: https://github.com/antonagestam/collectfast/blob/master/collectfast/management/commands/collectstatic.py#L142

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I missed that line in the template. I can't think of a better way at this point to override only the template and summary due to the order of execution. For now, I'll wrap testing on Django 1.4+ and Python 2/3 and push the changes for the input call still overriding handle_noargs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Testing done. All is well in my environment with Python 2/3 and Django 1.4 - 1.7 using S3 and boto with collectfast.

You have requested to collect static files at the destination
location as specified in your settings%s

Expand Down