Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
synnefo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
itminedu
synnefo
Commits
0bd73dba
Commit
0bd73dba
authored
Apr 12, 2013
by
Ilias Tsitsimpis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
astakosclient: PEP-8 style fixes
parent
20a8189b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
8 deletions
+18
-8
astakosclient/distribute_setup.py
astakosclient/distribute_setup.py
+18
-8
No files found.
astakosclient/distribute_setup.py
View file @
0bd73dba
...
...
@@ -150,11 +150,11 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
e
=
sys
.
exc_info
()[
1
]
if
was_imported
:
sys
.
stderr
.
write
(
"The required version of distribute (>=%s) is not available,
\n
"
"and can't be installed while this script is running. Please
\n
"
"install a more recent version first, using
\n
"
"
'easy_install -U distribute'."
"
\n\n
(Currently using %r)
\n
"
%
(
version
,
e
.
args
[
0
]))
"The required version of distribute (>=%s) is not
\n
"
"available and can't be installed while this script
\n
"
"is running. Please install a more recent version first,
\n
"
"using
'easy_install -U distribute'."
"
\n\n
(Currently using %r)
\n
"
%
(
version
,
e
.
args
[
0
]))
sys
.
exit
(
2
)
else
:
del
pkg_resources
,
sys
.
modules
[
'pkg_resources'
]
# reload ok
...
...
@@ -167,6 +167,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
if
not
no_fake
:
_create_fake_setuptools_pkg_info
(
to_dir
)
def
download_setuptools
(
version
=
DEFAULT_VERSION
,
download_base
=
DEFAULT_URL
,
to_dir
=
os
.
curdir
,
delay
=
15
):
"""Download distribute from a specified location and return its filename
...
...
@@ -203,6 +204,7 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
dst
.
close
()
return
os
.
path
.
realpath
(
saveto
)
def
_no_sandbox
(
function
):
def
__no_sandbox
(
*
args
,
**
kw
):
try
:
...
...
@@ -227,6 +229,7 @@ def _no_sandbox(function):
return
__no_sandbox
def
_patch_file
(
path
,
content
):
"""Will backup the file then patch it"""
existing_content
=
open
(
path
).
read
()
...
...
@@ -245,15 +248,18 @@ def _patch_file(path, content):
_patch_file
=
_no_sandbox
(
_patch_file
)
def
_same_content
(
path
,
content
):
return
open
(
path
).
read
()
==
content
def
_rename_path
(
path
):
new_name
=
path
+
'.OLD.%s'
%
time
.
time
()
log
.
warn
(
'Renaming %s into %s'
,
path
,
new_name
)
os
.
rename
(
path
,
new_name
)
return
new_name
def
_remove_flat_installation
(
placeholder
):
if
not
os
.
path
.
isdir
(
placeholder
):
log
.
warn
(
'Unkown installation at %s'
,
placeholder
)
...
...
@@ -289,18 +295,20 @@ def _remove_flat_installation(placeholder):
_remove_flat_installation
=
_no_sandbox
(
_remove_flat_installation
)
def
_after_install
(
dist
):
log
.
warn
(
'After install bootstrap.'
)
placeholder
=
dist
.
get_command_obj
(
'install'
).
install_purelib
_create_fake_setuptools_pkg_info
(
placeholder
)
def
_create_fake_setuptools_pkg_info
(
placeholder
):
if
not
placeholder
or
not
os
.
path
.
exists
(
placeholder
):
log
.
warn
(
'Could not find the install location'
)
return
pyver
=
'%s.%s'
%
(
sys
.
version_info
[
0
],
sys
.
version_info
[
1
])
setuptools_file
=
'setuptools-%s-py%s.egg-info'
%
\
(
SETUPTOOLS_FAKED_VERSION
,
pyver
)
(
SETUPTOOLS_FAKED_VERSION
,
pyver
)
pkg_info
=
os
.
path
.
join
(
placeholder
,
setuptools_file
)
if
os
.
path
.
exists
(
pkg_info
):
log
.
warn
(
'%s already exists'
,
pkg_info
)
...
...
@@ -323,6 +331,7 @@ def _create_fake_setuptools_pkg_info(placeholder):
_create_fake_setuptools_pkg_info
=
_no_sandbox
(
_create_fake_setuptools_pkg_info
)
def
_patch_egg_dir
(
path
):
# let's check if it's already patched
pkg_info
=
os
.
path
.
join
(
path
,
'EGG-INFO'
,
'PKG-INFO'
)
...
...
@@ -343,6 +352,7 @@ def _patch_egg_dir(path):
_patch_egg_dir
=
_no_sandbox
(
_patch_egg_dir
)
def
_before_install
():
log
.
warn
(
'Before install bootstrap.'
)
_fake_setuptools
()
...
...
@@ -406,7 +416,7 @@ def _fake_setuptools():
log
.
warn
(
'Egg installation'
)
pkg_info
=
os
.
path
.
join
(
setuptools_location
,
'EGG-INFO'
,
'PKG-INFO'
)
if
(
os
.
path
.
exists
(
pkg_info
)
and
_same_content
(
pkg_info
,
SETUPTOOLS_PKG_INFO
)):
_same_content
(
pkg_info
,
SETUPTOOLS_PKG_INFO
)):
log
.
warn
(
'Already patched.'
)
return
log
.
warn
(
'Patching...'
)
...
...
@@ -448,7 +458,7 @@ def _extractall(self, path=".", members=None):
# Extract directories with a safe mode.
directories
.
append
(
tarinfo
)
tarinfo
=
copy
.
copy
(
tarinfo
)
tarinfo
.
mode
=
448
# decimal for oct 0700
tarinfo
.
mode
=
448
# decimal for oct 0700
self
.
extract
(
tarinfo
,
path
)
# Reverse sort directories.
...
...
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