Remove some from __future__, forbid 2.5 in setup
This commit is contained in:
parent
c0740e695d
commit
fb1b8bc5b8
3 changed files with 3 additions and 9 deletions
|
|
@ -1,7 +1,5 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
from __future__ import with_statement
|
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
8
setup.py
8
setup.py
|
|
@ -1,7 +1,7 @@
|
||||||
#! /usr/bin/env python
|
#! /usr/bin/env python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
# Copyright(C) 2010-2011 Christophe Benz
|
# Copyright(C) 2010-2013 Christophe Benz, Laurent Bachelier
|
||||||
#
|
#
|
||||||
# This file is part of weboob.
|
# This file is part of weboob.
|
||||||
#
|
#
|
||||||
|
|
@ -19,8 +19,6 @@
|
||||||
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
from __future__ import with_statement
|
|
||||||
|
|
||||||
from setuptools import find_packages, setup
|
from setuptools import find_packages, setup
|
||||||
|
|
||||||
import glob
|
import glob
|
||||||
|
|
@ -182,7 +180,8 @@ if sys.version_info[0] > 2:
|
||||||
print >>sys.stderr, 'Python 3 is not supported.'
|
print >>sys.stderr, 'Python 3 is not supported.'
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
if sys.version_info[1] < 6: # older than 2.6
|
if sys.version_info[1] < 6: # older than 2.6
|
||||||
requirements.append('simplejson')
|
print >>sys.stderr, 'Python older than 2.6 is not supported.'
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
if not options.deps:
|
if not options.deps:
|
||||||
requirements = []
|
requirements = []
|
||||||
|
|
@ -202,7 +201,6 @@ setup(
|
||||||
'Environment :: Console',
|
'Environment :: Console',
|
||||||
'Environment :: X11 Applications :: Qt',
|
'Environment :: X11 Applications :: Qt',
|
||||||
'License :: OSI Approved :: GNU Affero General Public License v3',
|
'License :: OSI Approved :: GNU Affero General Public License v3',
|
||||||
'Programming Language :: Python :: 2.5',
|
|
||||||
'Programming Language :: Python :: 2.6',
|
'Programming Language :: Python :: 2.6',
|
||||||
'Programming Language :: Python :: 2.7',
|
'Programming Language :: Python :: 2.7',
|
||||||
'Programming Language :: Python',
|
'Programming Language :: Python',
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,6 @@
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from __future__ import with_statement
|
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue