Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 2to3 and packaging of dateutil #1234

Merged
merged 1 commit into from Sep 12, 2012
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -214,7 +214,7 @@ def add_pytz():
def add_dateutil():
packages.append('dateutil')
packages.append('dateutil.zoneinfo')
package_data['dateutil'] = ['zoneinfo/zoneinfo*.tar.*']
package_data['dateutil'] = ['zoneinfo/*.tar.gz']
if sys.version_info[0] >= 3:
package_dir['dateutil'] = 'lib/dateutil_py3'
else:
Expand Down Expand Up @@ -263,7 +263,7 @@ def add_six():

if sys.version_info[0] >= 3:
def should_2to3(file, root):
file = os.path.abspath(file)[len(os.path.abspath(root)):]
file = os.path.abspath(file)[len(os.path.abspath(root))+1:]
if ('py3' in file or
file.startswith('pytz') or
file.startswith('dateutil') or
Expand Down