Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos.buildout
Commits
98636c73
Commit
98636c73
authored
Jun 21, 2011
by
Lucas Carvalho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved imports to avoid circular import.
parent
a4f4b49f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+6
-3
src/zc/buildout/networkcache.py
src/zc/buildout/networkcache.py
+3
-1
No files found.
src/zc/buildout/easy_install.py
View file @
98636c73
...
@@ -18,9 +18,6 @@ It doesn't install scripts. It uses setuptools and requires it to be
...
@@ -18,9 +18,6 @@ It doesn't install scripts. It uses setuptools and requires it to be
installed.
installed.
"""
"""
from
zc.buildout.networkcache
import
get_filename_from_url
,
\
upload_network_cached
,
\
download_network_cached
import
distutils.errors
import
distutils.errors
import
fnmatch
import
fnmatch
import
glob
import
glob
...
@@ -44,6 +41,12 @@ _oprp = getattr(os.path, 'realpath', lambda path: path)
...
@@ -44,6 +41,12 @@ _oprp = getattr(os.path, 'realpath', lambda path: path)
def
realpath
(
path
):
def
realpath
(
path
):
return
os
.
path
.
normcase
(
os
.
path
.
abspath
(
_oprp
(
path
)))
return
os
.
path
.
normcase
(
os
.
path
.
abspath
(
_oprp
(
path
)))
from
zc.buildout.networkcache
import
get_filename_from_url
,
\
upload_network_cached
,
\
download_network_cached
default_index_url
=
os
.
environ
.
get
(
default_index_url
=
os
.
environ
.
get
(
'buildout-testing-index-url'
,
'buildout-testing-index-url'
,
'http://pypi.python.org/simple'
,
'http://pypi.python.org/simple'
,
...
...
src/zc/buildout/networkcache.py
View file @
98636c73
...
@@ -19,7 +19,6 @@ import posixpath
...
@@ -19,7 +19,6 @@ import posixpath
import
re
import
re
import
urllib
import
urllib
import
urlparse
import
urlparse
from
download
import
check_md5sum
from
slapos.libnetworkcache
import
NetworkcacheClient
,
UploadError
,
\
from
slapos.libnetworkcache
import
NetworkcacheClient
,
UploadError
,
\
DirectoryNotFound
DirectoryNotFound
...
@@ -126,3 +125,6 @@ def get_filename_from_url(url):
...
@@ -126,3 +125,6 @@ def get_filename_from_url(url):
assert
name
,
(
assert
name
,
(
'URL %r produced no filename'
%
url
)
'URL %r produced no filename'
%
url
)
return
name
return
name
from
download
import
check_md5sum
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment