Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
4dfa1571
Commit
4dfa1571
authored
Mar 06, 2017
by
林檎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use condition rather than try/catch
parent
6e3d4877
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
helper.py
cps/helper.py
+3
-3
web.py
cps/web.py
+4
-2
No files found.
cps/helper.py
View file @
4dfa1571
...
...
@@ -245,9 +245,9 @@ def get_valid_filename(value, replace_whitespace=True):
value
=
value
.
replace
(
u'ß'
,
u'ss'
)
value
=
unicodedata
.
normalize
(
'NFKD'
,
value
)
re_slugify
=
re
.
compile
(
'[
\
W
\
s-]'
,
re
.
UNICODE
)
try
:
value
=
str
(
re_slugify
.
sub
(
''
,
value
)
.
strip
()
)
e
xcept
UnicodeEncodeError
as
e
:
#will exception on Python2.7
if
type
(
value
)
is
str
:
#Python3 str, Python2 unicode
value
=
re_slugify
.
sub
(
''
,
value
)
.
strip
(
)
e
lse
:
value
=
unicode
(
re_slugify
.
sub
(
''
,
value
)
.
strip
())
if
replace_whitespace
:
#*+:\"/<>? werden durch _ ersetzt
...
...
cps/web.py
View file @
4dfa1571
...
...
@@ -1052,8 +1052,10 @@ def stats():
stdin
=
subprocess
.
PIPE
)
p
.
wait
()
for
lines
in
p
.
stdout
.
readlines
():
if
re
.
search
(
'Amazon kindlegen
\
('
,
str
(
lines
)):
versions
[
'KindlegenVersion'
]
=
str
(
lines
)
if
type
(
lines
)
is
bytes
:
lines
=
lines
.
decode
(
'utf-8'
)
if
re
.
search
(
'Amazon kindlegen
\
('
,
lines
):
versions
[
'KindlegenVersion'
]
=
lines
versions
[
'PythonVersion'
]
=
sys
.
version
versions
[
'babel'
]
=
babelVersion
versions
[
'sqlalchemy'
]
=
sqlalchemyVersion
...
...
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