Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
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
nexedi
converse.js
Commits
a5b86bd3
Commit
a5b86bd3
authored
Nov 04, 2014
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pylint fixes
Signed-off-by:
Michal Čihař
<
michal@cihar.com
>
parent
4d144c7a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
openshift/openshiftlibs.py
openshift/openshiftlibs.py
+2
-2
openshift/wsgi_install.py
openshift/wsgi_install.py
+1
-1
No files found.
openshift/openshiftlibs.py
View file @
a5b86bd3
...
@@ -28,7 +28,7 @@ def get_openshift_secret_token():
...
@@ -28,7 +28,7 @@ def get_openshift_secret_token():
uuid
=
os
.
getenv
(
'OPENSHIFT_APP_UUID'
)
uuid
=
os
.
getenv
(
'OPENSHIFT_APP_UUID'
)
if
token
is
not
None
:
if
token
is
not
None
:
return
token
return
token
elif
(
name
is
not
None
and
uuid
is
not
None
)
:
elif
name
is
not
None
and
uuid
is
not
None
:
return
hashlib
.
sha256
(
name
+
'-'
+
uuid
).
hexdigest
()
return
hashlib
.
sha256
(
name
+
'-'
+
uuid
).
hexdigest
()
return
None
return
None
...
@@ -101,7 +101,7 @@ def make_secure_key(key_info):
...
@@ -101,7 +101,7 @@ def make_secure_key(key_info):
# Create a random string the same length as the default
# Create a random string the same length as the default
rand_key
=
''
rand_key
=
''
for
_
in
range
(
len
(
original
)):
for
dummy
in
range
(
len
(
original
)):
rand_pos
=
random
.
randint
(
0
,
len
(
chars
))
rand_pos
=
random
.
randint
(
0
,
len
(
chars
))
rand_key
+=
chars
[
rand_pos
:(
rand_pos
+
1
)]
rand_key
+=
chars
[
rand_pos
:(
rand_pos
+
1
)]
...
...
openshift/wsgi_install.py
View file @
a5b86bd3
...
@@ -112,7 +112,7 @@ pre {
...
@@ -112,7 +112,7 @@ pre {
log_msg
=
os
.
popen
(
log_msg
=
os
.
popen
(
'cat ${OPENSHIFT_PYTHON_LOG_DIR}/install.log |'
'cat ${OPENSHIFT_PYTHON_LOG_DIR}/install.log |'
+
' grep
\
'
^[^ ]
\
\
|setup.py install
\
'
|'
+
' grep
\
'
^[^ ]
\
\
|setup.py install
\
'
|'
+
' sed
\
'
s,/var/lib/openshift/[a-z0-9]
\
{
24
\
},~,g
\
''
+
r
' sed \'s,/var/lib/openshift/[a-z0-9]\
{
24\
},~,g
\''
).read()
).read()
log = '
<
pre
>
' + log_msg + '
</
pre
>
'
log = '
<
pre
>
' + log_msg + '
</
pre
>
'
...
...
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