fix tabs
This commit is contained in:
parent
3f01e48a00
commit
bfff1e1093
2 changed files with 54 additions and 54 deletions
|
@ -8,41 +8,41 @@ __all__ = ["objproxy", "config"]
|
||||||
from . import objproxy, config
|
from . import objproxy, config
|
||||||
|
|
||||||
try:
|
try:
|
||||||
unicode
|
unicode
|
||||||
except NameError:
|
except NameError:
|
||||||
unicode = str
|
unicode = str
|
||||||
|
|
||||||
def ascii(s):
|
def ascii(s):
|
||||||
if isinstance(s, bytes):
|
if isinstance(s, bytes):
|
||||||
return s
|
return s
|
||||||
elif isinstance(s, unicode):
|
elif isinstance(s, unicode):
|
||||||
return s.encode(u'ascii')
|
return s.encode(u'ascii')
|
||||||
else:
|
else:
|
||||||
return str(s)
|
return str(s)
|
||||||
|
|
||||||
def utf8(s):
|
def utf8(s):
|
||||||
if isinstance(s, bytes):
|
if isinstance(s, bytes):
|
||||||
return s
|
return s
|
||||||
elif isinstance(s, unicode):
|
elif isinstance(s, unicode):
|
||||||
return s.encode(u'utf-8')
|
return s.encode(u'utf-8')
|
||||||
else:
|
else:
|
||||||
return str(s)
|
return str(s)
|
||||||
|
|
||||||
def from_ascii(s):
|
def from_ascii(s):
|
||||||
if isinstance(s, unicode):
|
if isinstance(s, unicode):
|
||||||
return s
|
return s
|
||||||
else:
|
else:
|
||||||
return s.decode(u'ascii')
|
return s.decode(u'ascii')
|
||||||
|
|
||||||
def from_latin1(s):
|
def from_latin1(s):
|
||||||
if isinstance(s, unicode):
|
if isinstance(s, unicode):
|
||||||
return s
|
return s
|
||||||
else:
|
else:
|
||||||
return s.decode(u'latin-1')
|
return s.decode(u'latin-1')
|
||||||
|
|
||||||
def from_utf8(s):
|
def from_utf8(s):
|
||||||
if isinstance(s, unicode):
|
if isinstance(s, unicode):
|
||||||
return s
|
return s
|
||||||
else:
|
else:
|
||||||
return s.decode(u'utf-8')
|
return s.decode(u'utf-8')
|
||||||
|
|
||||||
|
|
64
setup.py
64
setup.py
|
@ -5,41 +5,41 @@ import sys
|
||||||
import shutil
|
import shutil
|
||||||
import distutils.sysconfig
|
import distutils.sysconfig
|
||||||
try:
|
try:
|
||||||
from cPickle import load, dump
|
from cPickle import load, dump
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from pickle import load, dump
|
from pickle import load, dump
|
||||||
|
|
||||||
packages=['cecil', 'cecil.core']
|
packages=['cecil', 'cecil.core']
|
||||||
|
|
||||||
if sys.argv[1] == 'clean':
|
if sys.argv[1] == 'clean':
|
||||||
for dir in packages:
|
for dir in packages:
|
||||||
dir_to_remove = os.path.join(distutils.sysconfig.get_python_lib(), dir)
|
dir_to_remove = os.path.join(distutils.sysconfig.get_python_lib(), dir)
|
||||||
assert len(dir_to_remove) > (len(distutils.sysconfig.get_python_lib()) + 1)
|
assert len(dir_to_remove) > (len(distutils.sysconfig.get_python_lib()) + 1)
|
||||||
shutil.rmtree(dir_to_remove)
|
shutil.rmtree(dir_to_remove)
|
||||||
else:
|
else:
|
||||||
majorversion = '1.1.0'
|
majorversion = '1.1.0'
|
||||||
buildnumber = 0
|
buildnumber = 0
|
||||||
if os.path.exists('buildnum'):
|
if os.path.exists('buildnum'):
|
||||||
fd = open('buildnum', 'rb')
|
fd = open('buildnum', 'rb')
|
||||||
try:
|
try:
|
||||||
vinfo = load(fd)
|
vinfo = load(fd)
|
||||||
mv, bn = vinfo
|
mv, bn = vinfo
|
||||||
if mv == majorversion:
|
if mv == majorversion:
|
||||||
buildnumber = bn
|
buildnumber = bn
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
fd.close()
|
fd.close()
|
||||||
buildnumber += 1
|
buildnumber += 1
|
||||||
fd = open('buildnum', 'wb')
|
fd = open('buildnum', 'wb')
|
||||||
dump((majorversion, buildnumber), fd)
|
dump((majorversion, buildnumber), fd)
|
||||||
fd.close()
|
fd.close()
|
||||||
|
|
||||||
ver = '%s' % (majorversion,)
|
ver = '%s' % (majorversion,)
|
||||||
print("Building version %s" % (ver,))
|
print("Building version %s" % (ver,))
|
||||||
setup(
|
setup(
|
||||||
name='pycecil',
|
name='pycecil',
|
||||||
version=ver,
|
version=ver,
|
||||||
packages=packages
|
packages=packages
|
||||||
)
|
)
|
||||||
if os.path.exists("setup.py") and os.path.exists("build"):
|
if os.path.exists("setup.py") and os.path.exists("build"):
|
||||||
shutil.rmtree("build")
|
shutil.rmtree("build")
|
||||||
|
|
Loading…
Add table
Reference in a new issue