diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-06-19 11:45:38 +0100 |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-06-19 11:45:38 +0100 |
| commit | 8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc (patch) | |
| tree | 199a8e4792f87c951fcf82197061c35e5805d100 /pkg_resources.py | |
| parent | 744a61f18bbfcbf7dfaa08886185b4595d8b7bcb (diff) | |
| parent | 5d9d3930f400a754f38be2a4de21a7f9ed00f5f4 (diff) | |
| download | external_python_setuptools-8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc.tar.gz external_python_setuptools-8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc.tar.bz2 external_python_setuptools-8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc.zip | |
Merged upstream changes.
--HG--
branch : single-codebase
Diffstat (limited to 'pkg_resources.py')
| -rw-r--r-- | pkg_resources.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index 521a7e00..e03667e0 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -13,7 +13,7 @@ The package resource API is designed to work with normal filesystem packages, method. """ -import sys, os, zipfile, zipimport, time, re, imp, types +import sys, os, time, re, imp, types, zipfile, zipimport try: from urlparse import urlparse, urlunparse except ImportError: |