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 | e1a9b4dcc7b67e61b28fdefd33495ecc0fd7313b (patch) | |
| tree | f3434e338d7a1573cff64cc131b6cd32fdd3091e /pkg_resources.py | |
| parent | 1961cbe6164c403810e07f39c88c58241fac2d41 (diff) | |
| parent | 7834517bc7b158e4b85d6a4a4a425a2f4593d3db (diff) | |
| download | python-setuptools-bitbucket-e1a9b4dcc7b67e61b28fdefd33495ecc0fd7313b.tar.gz | |
Merged upstream changes.
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: |