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
f7e640fd
Commit
f7e640fd
authored
Mar 02, 2019
by
Daniel Pavel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support pycountry if iso-639 is not available
parent
4b301a79
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
4 deletions
+31
-4
epub.py
cps/epub.py
+1
-1
isoLanguages.py
cps/isoLanguages.py
+28
-0
web.py
cps/web.py
+2
-3
No files found.
cps/epub.py
View file @
f7e640fd
...
@@ -21,7 +21,7 @@ import zipfile
...
@@ -21,7 +21,7 @@ import zipfile
from
lxml
import
etree
from
lxml
import
etree
import
os
import
os
import
uploader
import
uploader
from
iso639
import
languages
as
isoLanguages
import
isoLanguages
def
extractCover
(
zipFile
,
coverFile
,
coverpath
,
tmp_file_name
):
def
extractCover
(
zipFile
,
coverFile
,
coverpath
,
tmp_file_name
):
...
...
cps/isoLanguages.py
0 → 100644
View file @
f7e640fd
#!/usr/bin/env python
# -*- coding: utf-8 -*-
try
:
from
iso639
import
languages
,
__version__
get
=
languages
.
get
except
ImportError
:
from
pycountry
import
languages
as
pyc_languages
try
:
import
pkg_resources
__version__
=
pkg_resources
.
get_distribution
(
'pycountry'
)
.
version
+
' (PyCountry)'
del
pkg_resources
except
:
__version__
=
"? (PyCountry)"
def
_copy_fields
(
l
):
l
.
part1
=
l
.
alpha_2
l
.
part3
=
l
.
alpha_3
return
l
def
get
(
name
=
None
,
part1
=
None
,
part3
=
None
):
if
(
part3
is
not
None
):
return
_copy_fields
(
pyc_languages
.
get
(
alpha_3
=
part3
))
if
(
part1
is
not
None
):
return
_copy_fields
(
pyc_languages
.
get
(
alpha_2
=
part1
))
if
(
name
is
not
None
):
return
_copy_fields
(
pyc_languages
.
get
(
name
=
name
))
cps/web.py
View file @
f7e640fd
...
@@ -61,8 +61,7 @@ import base64
...
@@ -61,8 +61,7 @@ import base64
from
sqlalchemy.sql
import
*
from
sqlalchemy.sql
import
*
import
json
import
json
import
datetime
import
datetime
from
iso639
import
languages
as
isoLanguages
import
isoLanguages
from
iso639
import
__version__
as
iso639Version
from
pytz
import
__version__
as
pytzVersion
from
pytz
import
__version__
as
pytzVersion
from
uuid
import
uuid4
from
uuid
import
uuid4
import
os.path
import
os.path
...
@@ -1657,7 +1656,7 @@ def stats():
...
@@ -1657,7 +1656,7 @@ def stats():
versions
[
'Flask'
]
=
'v'
+
flaskVersion
versions
[
'Flask'
]
=
'v'
+
flaskVersion
versions
[
'Flask Login'
]
=
'v'
+
flask_loginVersion
versions
[
'Flask Login'
]
=
'v'
+
flask_loginVersion
versions
[
'Flask Principal'
]
=
'v'
+
flask_principalVersion
versions
[
'Flask Principal'
]
=
'v'
+
flask_principalVersion
versions
[
'Iso 639'
]
=
'v'
+
iso
639Version
versions
[
'Iso 639'
]
=
'v'
+
iso
Languages
.
__version__
versions
[
'pytz'
]
=
'v'
+
pytzVersion
versions
[
'pytz'
]
=
'v'
+
pytzVersion
versions
[
'Requests'
]
=
'v'
+
requests
.
__version__
versions
[
'Requests'
]
=
'v'
+
requests
.
__version__
...
...
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