mirror of
https://github.com/janeczku/calibre-web
synced 2024-12-18 22:20:30 +00:00
bbf6d9b026
Bugfix for feeds
- removed categories related and up
- load new books now working
- category random now working
login page is free of non accessible elements
boolean custom column is vivible in UI
books with only with certain languages can be shown
book shelfs can be deleted from UI
Anonymous user view is more resticted
Added browse of series in sidebar
Dependencys in vendor folder are updated to newer versions (licencs files are now present)
Bugfix editing Authors names
Made upload on windows working
67 lines
1.5 KiB
Python
67 lines
1.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
"""
|
|
requests.compat
|
|
~~~~~~~~~~~~~~~
|
|
|
|
This module handles import compatibility issues between Python 2 and
|
|
Python 3.
|
|
"""
|
|
|
|
from .packages import chardet
|
|
|
|
import sys
|
|
|
|
# -------
|
|
# Pythons
|
|
# -------
|
|
|
|
# Syntax sugar.
|
|
_ver = sys.version_info
|
|
|
|
#: Python 2.x?
|
|
is_py2 = (_ver[0] == 2)
|
|
|
|
#: Python 3.x?
|
|
is_py3 = (_ver[0] == 3)
|
|
|
|
try:
|
|
import simplejson as json
|
|
except (ImportError, SyntaxError):
|
|
# simplejson does not support Python 3.2, it throws a SyntaxError
|
|
# because of u'...' Unicode literals.
|
|
import json
|
|
|
|
# ---------
|
|
# Specifics
|
|
# ---------
|
|
|
|
if is_py2:
|
|
from urllib import quote, unquote, quote_plus, unquote_plus, urlencode, getproxies, proxy_bypass
|
|
from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag
|
|
from urllib2 import parse_http_list
|
|
import cookielib
|
|
from Cookie import Morsel
|
|
from StringIO import StringIO
|
|
from .packages.urllib3.packages.ordered_dict import OrderedDict
|
|
|
|
builtin_str = str
|
|
bytes = str
|
|
str = unicode
|
|
basestring = basestring
|
|
numeric_types = (int, long, float)
|
|
|
|
elif is_py3:
|
|
from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus, urldefrag
|
|
from urllib.request import parse_http_list, getproxies, proxy_bypass
|
|
from http import cookiejar as cookielib
|
|
from http.cookies import Morsel
|
|
from io import StringIO
|
|
from collections import OrderedDict
|
|
|
|
builtin_str = str
|
|
str = str
|
|
bytes = bytes
|
|
basestring = (str, bytes)
|
|
numeric_types = (int, float)
|