deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-28 09:51:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Move GAM to use Python 3. Fixes #392 (#896)

Browse Source 
* 2to3 cleanup, import changes, httplib2 py3 version, fix passlib deprecation

* Travis Python 3 move

* default to Trusty for Python 3.7.3

* use daadsnakes PPA

* start with default python

* --yes

* 3.5 for now, may tighten in future

* compile 3.7 from source

* osx and linux

* Update linux-x86_64-before-install.sh

* pip3

* bash env, more debug

* quiet down the make

* alias

* kill virtualenv

* 2.6

* again

* again

* deactivate

* pip3

* pip3

* Update linux-x86_64-before-install.sh

* Update linux-x86_64-before-install.sh

* Update .travis.yml

* cleanup

*  give xenial a shot

* 3.7.3, trusty

* 3.7.3, xenial

* pip3

* no sudo

* StaticX for a truly static Linux build

* StaticX for realz

* Install StaticX deps

* log size and run times

* actually time

* remove old gam

* distro

* debug pyinstaller

* Fix StaticX path discovery

* Detect old glibc and install legacy GAM build

* report version

* fix

* fix distro list

* StaticX workaround

* travis staticx builds

* remove 3P libraries from GAM

These libraries can (and should) be installed via
pip install -r requirements.txt

* Have travis install reqs

* fix cacert (static for now)

* remove bad gam.spec

* fix requirements.txt location

* try another path

* deploy all branches

* win/osx fix attempts
This commit is contained in:
Jay Lee
2019-04-21 17:03:07 -04:00
committed by GitHub
parent 892d200cd2
commit 457ce15a4c
468 changed files with 6178 additions and 141349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/utils.py
View File

@@ -1,21 +1,21 @@
import collections
import re
import sys
from htmlentitydefs import name2codepoint
from HTMLParser import HTMLParser
from html.entities import name2codepoint
from html.parser import HTMLParser
from var import GM_Globals, GM_WINDOWS, GM_SYS_ENCODING, ONE_KILO_BYTES, ONE_MEGA_BYTES, ONE_GIGA_BYTES
def convertUTF8(data):
if isinstance(data, str):
return data
if isinstance(data, unicode):
if isinstance(data, str):
if GM_Globals[GM_WINDOWS]:
return data
return data.encode(GM_Globals[GM_SYS_ENCODING])
if isinstance(data, collections.Mapping):
return dict(map(convertUTF8, data.iteritems()))
return dict(list(map(convertUTF8, iter(data.items()))))
if isinstance(data, collections.Iterable):
return type(data)(map(convertUTF8, data))
return type(data)(list(map(convertUTF8, data)))
return data
class _DeHTMLParser(HTMLParser):
@@ -27,14 +27,14 @@ class _DeHTMLParser(HTMLParser):
self.__text.append(data)
def handle_charref(self, name):
self.__text.append(unichr(int(name[1:], 16)) if name.startswith('x') else unichr(int(name)))
self.__text.append(chr(int(name[1:], 16)) if name.startswith('x') else chr(int(name)))
def handle_entityref(self, name):
cp = name2codepoint.get(name)
if cp:
self.__text.append(unichr(cp))
self.__text.append(chr(cp))
else:
self.__text.append(u'&'+name)
self.__text.append('&'+name)
def handle_starttag(self, tag, attrs):
if tag == 'p':
@@ -62,7 +62,7 @@ class _DeHTMLParser(HTMLParser):
def dehtml(text):
try:
parser = _DeHTMLParser()
parser.feed(text.encode(u'utf-8'))
parser.feed(text.encode('utf-8'))
parser.close()
return parser.text()
except:
@@ -71,21 +71,21 @@ def dehtml(text):
return text
def indentMultiLineText(message, n=0):
return message.replace(u'\n', u'\n{0}'.format(u' '*n)).rstrip()
return message.replace('\n', '\n{0}'.format(' '*n)).rstrip()
def formatFileSize(fileSize):
if fileSize == 0:
return u'0kb'
return '0kb'
if fileSize < ONE_KILO_BYTES:
return u'1kb'
return '1kb'
if fileSize < ONE_MEGA_BYTES:
return u'{0}kb'.format(fileSize/ONE_KILO_BYTES)
return '{0}kb'.format(fileSize/ONE_KILO_BYTES)
if fileSize < ONE_GIGA_BYTES:
return u'{0}mb'.format(fileSize/ONE_MEGA_BYTES)
return u'{0}gb'.format(fileSize/ONE_GIGA_BYTES)
return '{0}mb'.format(fileSize/ONE_MEGA_BYTES)
return '{0}gb'.format(fileSize/ONE_GIGA_BYTES)
def formatMilliSeconds(millis):
seconds, millis = divmod(millis, 1000)
minutes, seconds = divmod(seconds, 60)
hours, minutes = divmod(minutes, 60)
return u'%02d:%02d:%02d' % (hours, minutes, seconds)
return '%02d:%02d:%02d' % (hours, minutes, seconds)