Merge pull request #1234 from cgohlke/patch-2

mdboom · mdboom · commit 3e65956aa6e9 · 2012-09-12T11:25:15.000-07:00
Fix 2to3 and packaging of dateutil
diff --git a/setup.py b/setup.py
@@ -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:
@@ -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
