diff --git a/gramps/cli/arghandler.py b/gramps/cli/arghandler.py index 1068c22d3..0db169d30 100644 --- a/gramps/cli/arghandler.py +++ b/gramps/cli/arghandler.py @@ -34,7 +34,6 @@ Module responsible for handling the command line arguments for Gramps. # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function import os import sys diff --git a/gramps/cli/argparser.py b/gramps/cli/argparser.py index e61c6226c..8e0233df3 100644 --- a/gramps/cli/argparser.py +++ b/gramps/cli/argparser.py @@ -34,7 +34,6 @@ Module responsible for handling the command line arguments for Gramps. # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function, unicode_literals import sys import getopt import logging diff --git a/gramps/cli/clidbman.py b/gramps/cli/clidbman.py index 0ff547492..8e61decfe 100644 --- a/gramps/cli/clidbman.py +++ b/gramps/cli/clidbman.py @@ -30,8 +30,6 @@ creating, and deleting of databases. # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import os import sys import time diff --git a/gramps/cli/grampscli.py b/gramps/cli/grampscli.py index e883a8a12..a45564a19 100644 --- a/gramps/cli/grampscli.py +++ b/gramps/cli/grampscli.py @@ -31,8 +31,6 @@ Provides also two small base classes: :class:`CLIDbLoader`, :class:`CLIManager` # Python modules # #------------------------------------------------------------------------- -from __future__ import print_function - from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext import os diff --git a/gramps/cli/plug/__init__.py b/gramps/cli/plug/__init__.py index c887b5114..23b981c64 100644 --- a/gramps/cli/plug/__init__.py +++ b/gramps/cli/plug/__init__.py @@ -32,7 +32,6 @@ # Python modules # #------------------------------------------------------------------------- -from __future__ import print_function import traceback import os import sys diff --git a/gramps/cli/test/argparser_test.py b/gramps/cli/test/argparser_test.py index eec9fb52a..3f3006803 100644 --- a/gramps/cli/test/argparser_test.py +++ b/gramps/cli/test/argparser_test.py @@ -21,8 +21,6 @@ """ Unittest for argparser.py """ -from __future__ import print_function - import unittest from ..argparser import ArgParser import sys diff --git a/gramps/cli/test/cli_test.py b/gramps/cli/test/cli_test.py index e36a747d2..f83f97847 100644 --- a/gramps/cli/test/cli_test.py +++ b/gramps/cli/test/cli_test.py @@ -20,8 +20,6 @@ """ CLI tests for gramps """ -from __future__ import unicode_literals - import os import unittest import re diff --git a/gramps/cli/test/user_test.py b/gramps/cli/test/user_test.py index 0c645219e..a2bb2a6c8 100644 --- a/gramps/cli/test/user_test.py +++ b/gramps/cli/test/user_test.py @@ -21,8 +21,6 @@ """ Unittest for user.py """ -from __future__ import print_function - import unittest from .. import user from ...gen.test.user_test import TestUser diff --git a/gramps/cli/user.py b/gramps/cli/user.py index 12698a1dd..03a60eafe 100644 --- a/gramps/cli/user.py +++ b/gramps/cli/user.py @@ -27,7 +27,6 @@ The User class provides basic interaction with the user. # Python Modules # #------------------------------------------------------------------------ -from __future__ import print_function, unicode_literals import sys #------------------------------------------------------------------------ diff --git a/gramps/gen/const.py b/gramps/gen/const.py index 85415d3dc..fcb5da02c 100644 --- a/gramps/gen/const.py +++ b/gramps/gen/const.py @@ -25,8 +25,6 @@ Provides constants for other modules """ -from __future__ import unicode_literals - #------------------------------------------------------------------------- # # Standard python modules diff --git a/gramps/gen/datehandler/__init__.py b/gramps/gen/datehandler/__init__.py index 620e294ba..edfeeed3d 100644 --- a/gramps/gen/datehandler/__init__.py +++ b/gramps/gen/datehandler/__init__.py @@ -22,8 +22,6 @@ Class handling language-specific selection for date parser and displayer. """ -from __future__ import print_function, unicode_literals - #------------------------------------------------------------------------- # # set up logging diff --git a/gramps/gen/datehandler/_date_ar.py b/gramps/gen/datehandler/_date_ar.py index 28cee023b..c0a8d18f7 100644 --- a/gramps/gen/datehandler/_date_ar.py +++ b/gramps/gen/datehandler/_date_ar.py @@ -28,7 +28,6 @@ Arabic-specific classes for parsing and displaying dates. # Python modules # #------------------------------------------------------------------------- -from __future__ import unicode_literals import re #------------------------------------------------------------------------- diff --git a/gramps/gen/datehandler/_date_bg.py b/gramps/gen/datehandler/_date_bg.py index bf60fd86d..620699bf2 100644 --- a/gramps/gen/datehandler/_date_bg.py +++ b/gramps/gen/datehandler/_date_bg.py @@ -22,7 +22,7 @@ """ Bulgarian-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_ca.py b/gramps/gen/datehandler/_date_ca.py index 0cc96101c..207faf498 100644 --- a/gramps/gen/datehandler/_date_ca.py +++ b/gramps/gen/datehandler/_date_ca.py @@ -24,7 +24,7 @@ """ Catalan-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_cs.py b/gramps/gen/datehandler/_date_cs.py index 2a8e974b1..5652ab7b9 100644 --- a/gramps/gen/datehandler/_date_cs.py +++ b/gramps/gen/datehandler/_date_cs.py @@ -22,7 +22,7 @@ """ Czech-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_da.py b/gramps/gen/datehandler/_date_da.py index a57a68343..3d3d0ed55 100644 --- a/gramps/gen/datehandler/_date_da.py +++ b/gramps/gen/datehandler/_date_da.py @@ -22,7 +22,7 @@ """ Danish-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_de.py b/gramps/gen/datehandler/_date_de.py index 8cde9ab27..1985fee3a 100644 --- a/gramps/gen/datehandler/_date_de.py +++ b/gramps/gen/datehandler/_date_de.py @@ -22,7 +22,7 @@ """ German-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_el.py b/gramps/gen/datehandler/_date_el.py index 918324c8e..bd82c9f01 100644 --- a/gramps/gen/datehandler/_date_el.py +++ b/gramps/gen/datehandler/_date_el.py @@ -24,7 +24,6 @@ Greek-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_es.py b/gramps/gen/datehandler/_date_es.py index 703dcab9d..890f1cb6d 100644 --- a/gramps/gen/datehandler/_date_es.py +++ b/gramps/gen/datehandler/_date_es.py @@ -22,7 +22,7 @@ """ Spanish-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_fi.py b/gramps/gen/datehandler/_date_fi.py index a9c3d4e6e..a1773ba29 100644 --- a/gramps/gen/datehandler/_date_fi.py +++ b/gramps/gen/datehandler/_date_fi.py @@ -22,7 +22,7 @@ """ Finnish-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_fr.py b/gramps/gen/datehandler/_date_fr.py index 32eb9533f..02a363b38 100644 --- a/gramps/gen/datehandler/_date_fr.py +++ b/gramps/gen/datehandler/_date_fr.py @@ -21,16 +21,15 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +""" +French-specific classes for parsing and displaying dates. +""" + #------------------------------------------------------------------------- # # Python modules # #------------------------------------------------------------------------- - -""" -French-specific classes for parsing and displaying dates. -""" -from __future__ import unicode_literals import re #------------------------------------------------------------------------- diff --git a/gramps/gen/datehandler/_date_hr.py b/gramps/gen/datehandler/_date_hr.py index 43b4cdb63..cf81ed643 100644 --- a/gramps/gen/datehandler/_date_hr.py +++ b/gramps/gen/datehandler/_date_hr.py @@ -26,7 +26,7 @@ """ Croatian-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_it.py b/gramps/gen/datehandler/_date_it.py index 9cf091c16..43c42169b 100644 --- a/gramps/gen/datehandler/_date_it.py +++ b/gramps/gen/datehandler/_date_it.py @@ -24,7 +24,7 @@ """ Italian-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_lt.py b/gramps/gen/datehandler/_date_lt.py index e4d3a91ff..a21e3486f 100644 --- a/gramps/gen/datehandler/_date_lt.py +++ b/gramps/gen/datehandler/_date_lt.py @@ -22,7 +22,7 @@ """ Lithuanian-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_nb.py b/gramps/gen/datehandler/_date_nb.py index 2c71b02ad..7ce415ffc 100644 --- a/gramps/gen/datehandler/_date_nb.py +++ b/gramps/gen/datehandler/_date_nb.py @@ -22,7 +22,7 @@ """ Norwegian-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_nl.py b/gramps/gen/datehandler/_date_nl.py index ba5755dee..10ccdd6a0 100644 --- a/gramps/gen/datehandler/_date_nl.py +++ b/gramps/gen/datehandler/_date_nl.py @@ -28,7 +28,6 @@ """ Dutch-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals #------------------------------------------------------------------------- # diff --git a/gramps/gen/datehandler/_date_pl.py b/gramps/gen/datehandler/_date_pl.py index d3d263e0a..cc5b38047 100644 --- a/gramps/gen/datehandler/_date_pl.py +++ b/gramps/gen/datehandler/_date_pl.py @@ -25,7 +25,7 @@ """ Polish-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_pt.py b/gramps/gen/datehandler/_date_pt.py index 58d8e3256..913653373 100644 --- a/gramps/gen/datehandler/_date_pt.py +++ b/gramps/gen/datehandler/_date_pt.py @@ -24,7 +24,7 @@ """ Portuguese-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_ru.py b/gramps/gen/datehandler/_date_ru.py index 1c18e8560..973c8cc93 100644 --- a/gramps/gen/datehandler/_date_ru.py +++ b/gramps/gen/datehandler/_date_ru.py @@ -22,7 +22,7 @@ """ Russian-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_sk.py b/gramps/gen/datehandler/_date_sk.py index 64272a368..f95f14c7c 100644 --- a/gramps/gen/datehandler/_date_sk.py +++ b/gramps/gen/datehandler/_date_sk.py @@ -22,7 +22,7 @@ """ Slovak-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_sl.py b/gramps/gen/datehandler/_date_sl.py index 7278dc5cb..60b0e7e0f 100644 --- a/gramps/gen/datehandler/_date_sl.py +++ b/gramps/gen/datehandler/_date_sl.py @@ -24,7 +24,7 @@ """ Slovenian-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_sr.py b/gramps/gen/datehandler/_date_sr.py index a3b6aa78f..f03d76942 100644 --- a/gramps/gen/datehandler/_date_sr.py +++ b/gramps/gen/datehandler/_date_sr.py @@ -25,7 +25,7 @@ """ Serbian-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_sv.py b/gramps/gen/datehandler/_date_sv.py index 7ed5247ce..38b044ce1 100644 --- a/gramps/gen/datehandler/_date_sv.py +++ b/gramps/gen/datehandler/_date_sv.py @@ -22,7 +22,7 @@ """ Swedish-specific classes for parsing and displaying dates. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/datehandler/_date_uk.py b/gramps/gen/datehandler/_date_uk.py index 4bd1bf2fe..1699b8081 100644 --- a/gramps/gen/datehandler/_date_uk.py +++ b/gramps/gen/datehandler/_date_uk.py @@ -29,7 +29,6 @@ Ukrainian-specific classes for parsing and displaying dates. # Python modules # #------------------------------------------------------------------------- -from __future__ import unicode_literals import re #------------------------------------------------------------------------- diff --git a/gramps/gen/datehandler/_date_zh_CN.py b/gramps/gen/datehandler/_date_zh_CN.py index e7f77bc2b..7c9499519 100644 --- a/gramps/gen/datehandler/_date_zh_CN.py +++ b/gramps/gen/datehandler/_date_zh_CN.py @@ -19,16 +19,15 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # +""" +Simplified-Chinese-specific classes for parsing and displaying dates. +""" + #------------------------------------------------------------------------- # # Python modules # #------------------------------------------------------------------------- - -""" -Simplified-Chinese-specific classes for parsing and displaying dates. -""" -from __future__ import unicode_literals import re #------------------------------------------------------------------------- diff --git a/gramps/gen/datehandler/_date_zh_TW.py b/gramps/gen/datehandler/_date_zh_TW.py index 6f3572c31..533bf4aa3 100644 --- a/gramps/gen/datehandler/_date_zh_TW.py +++ b/gramps/gen/datehandler/_date_zh_TW.py @@ -19,16 +19,15 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +""" +Traditional-Chinese-specific classes for parsing and displaying dates. +""" + #------------------------------------------------------------------------- # # Python modules # #------------------------------------------------------------------------- - -""" -Traditional-Chinese-specific classes for parsing and displaying dates. -""" -from __future__ import unicode_literals import re #------------------------------------------------------------------------- diff --git a/gramps/gen/datehandler/_datedisplay.py b/gramps/gen/datehandler/_datedisplay.py index 9fbaca41e..908b4ae29 100644 --- a/gramps/gen/datehandler/_datedisplay.py +++ b/gramps/gen/datehandler/_datedisplay.py @@ -25,7 +25,6 @@ U.S English date display class. Should serve as the base class for all localized tasks. """ -from __future__ import unicode_literals #------------------------------------------------------------------------- # diff --git a/gramps/gen/datehandler/_datehandler.py b/gramps/gen/datehandler/_datehandler.py index 326fb2d4b..9362bbaf9 100644 --- a/gramps/gen/datehandler/_datehandler.py +++ b/gramps/gen/datehandler/_datehandler.py @@ -21,7 +21,6 @@ """ Class handling language-specific selection for date parser and displayer. """ -from __future__ import unicode_literals #------------------------------------------------------------------------- # diff --git a/gramps/gen/datehandler/_dateparser.py b/gramps/gen/datehandler/_dateparser.py index 1ffff0f37..ebe8a833f 100644 --- a/gramps/gen/datehandler/_dateparser.py +++ b/gramps/gen/datehandler/_dateparser.py @@ -29,8 +29,6 @@ date parsing class. The default base class provides parsing for English. # Python modules # #------------------------------------------------------------------------- -from __future__ import print_function, unicode_literals - import re import calendar diff --git a/gramps/gen/datehandler/_datestrings.py b/gramps/gen/datehandler/_datestrings.py index 6c0ea93d6..6039bdadb 100644 --- a/gramps/gen/datehandler/_datestrings.py +++ b/gramps/gen/datehandler/_datestrings.py @@ -22,7 +22,6 @@ """ Date strings to translate per each language for display and parsing. """ -from __future__ import print_function, unicode_literals #------------------------------------------------------------------------- # diff --git a/gramps/gen/datehandler/test/datedisplay_test.py b/gramps/gen/datehandler/test/datedisplay_test.py index c9dd04d5a..597dfe856 100644 --- a/gramps/gen/datehandler/test/datedisplay_test.py +++ b/gramps/gen/datehandler/test/datedisplay_test.py @@ -23,7 +23,6 @@ Deeper testing of some DateParser internals. """ -from __future__ import print_function, unicode_literals import unittest from ...utils.grampslocale import GrampsLocale diff --git a/gramps/gen/datehandler/test/datehandler_test.py b/gramps/gen/datehandler/test/datehandler_test.py index 4d0ce845a..8fb5a1d85 100644 --- a/gramps/gen/datehandler/test/datehandler_test.py +++ b/gramps/gen/datehandler/test/datehandler_test.py @@ -32,7 +32,6 @@ Based on the Check Localized Date Displayer and Parser tool. # standard python modules # #------------------------------------------------------------------------- -from __future__ import unicode_literals, division import unittest import sys diff --git a/gramps/gen/datehandler/test/dateparser_test.py b/gramps/gen/datehandler/test/dateparser_test.py index 18ee86698..2fbf57670 100644 --- a/gramps/gen/datehandler/test/dateparser_test.py +++ b/gramps/gen/datehandler/test/dateparser_test.py @@ -23,7 +23,6 @@ Deeper testing of some DateParser internals. """ -from __future__ import print_function, unicode_literals import unittest from ...utils.grampslocale import GrampsLocale diff --git a/gramps/gen/datehandler/test/datestrings_test.py b/gramps/gen/datehandler/test/datestrings_test.py index bf5a1e94f..eb4b7e639 100644 --- a/gramps/gen/datehandler/test/datestrings_test.py +++ b/gramps/gen/datehandler/test/datestrings_test.py @@ -19,8 +19,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import print_function, unicode_literals - import unittest from .. import _datestrings diff --git a/gramps/gen/db/bsddbtxn.py b/gramps/gen/db/bsddbtxn.py index 78c46bea5..5d15be382 100644 --- a/gramps/gen/db/bsddbtxn.py +++ b/gramps/gen/db/bsddbtxn.py @@ -27,7 +27,6 @@ BSDDBTxn class: Wrapper for BSDDB transaction-oriented methods # BSDDBTxn # #------------------------------------------------------------------------- -from __future__ import print_function, with_statement class BSDDBTxn(object): """ diff --git a/gramps/gen/db/exceptions.py b/gramps/gen/db/exceptions.py index 7da4ec7ab..50512656e 100644 --- a/gramps/gen/db/exceptions.py +++ b/gramps/gen/db/exceptions.py @@ -20,13 +20,6 @@ """Exceptions generated by the Db package.""" -#------------------------------------------------------------------------- -# -# Standard python modules -# -#------------------------------------------------------------------------- -from __future__ import print_function - #------------------------------------------------------------------------- # # Gramps modules diff --git a/gramps/gen/db/read.py b/gramps/gen/db/read.py index 1cbf0079b..c886c4869 100644 --- a/gramps/gen/db/read.py +++ b/gramps/gen/db/read.py @@ -29,8 +29,6 @@ Read classes for the Gramps databases. # libraries # #------------------------------------------------------------------------- -from __future__ import print_function, with_statement - import sys if sys.version_info[0] < 3: import cPickle as pickle diff --git a/gramps/gen/db/test/grampsdbtestbase.py b/gramps/gen/db/test/grampsdbtestbase.py index a3ed44bba..278eb480c 100644 --- a/gramps/gen/db/test/grampsdbtestbase.py +++ b/gramps/gen/db/test/grampsdbtestbase.py @@ -18,8 +18,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import print_function - import unittest import tempfile import shutil diff --git a/gramps/gen/db/txn.py b/gramps/gen/db/txn.py index cc67e66cc..9df39f9f4 100644 --- a/gramps/gen/db/txn.py +++ b/gramps/gen/db/txn.py @@ -28,8 +28,6 @@ database. # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function, with_statement - import sys if sys.version_info[0] < 3: import cPickle as pickle diff --git a/gramps/gen/db/undoredo.py b/gramps/gen/db/undoredo.py index e78acd409..2517fd3d5 100644 --- a/gramps/gen/db/undoredo.py +++ b/gramps/gen/db/undoredo.py @@ -29,8 +29,6 @@ undos and redos. # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function, with_statement - import time, os import sys if sys.version_info[0] < 3: diff --git a/gramps/gen/db/upgrade.py b/gramps/gen/db/upgrade.py index 99dd79d73..e5d293b7c 100644 --- a/gramps/gen/db/upgrade.py +++ b/gramps/gen/db/upgrade.py @@ -28,7 +28,6 @@ methods to upgrade a database from version 13 to current version # Standard python modules # #------------------------------------------------------------------------- -from __future__ import with_statement, unicode_literals import sys import os import re diff --git a/gramps/gen/db/write.py b/gramps/gen/db/write.py index 5e51c3421..e3d377623 100644 --- a/gramps/gen/db/write.py +++ b/gramps/gen/db/write.py @@ -30,7 +30,6 @@ This is used since Gramps version 3.0 # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function, with_statement, unicode_literals import sys if sys.version_info[0] < 3: import cPickle as pickle diff --git a/gramps/gen/filters/_filterlist.py b/gramps/gen/filters/_filterlist.py index 10a94eff8..cf0d33b5a 100644 --- a/gramps/gen/filters/_filterlist.py +++ b/gramps/gen/filters/_filterlist.py @@ -23,8 +23,6 @@ # Standard Python modules # #------------------------------------------------------------------------- -from __future__ import unicode_literals - from xml.sax import make_parser, SAXParseException import os import sys diff --git a/gramps/gen/filters/_filterparser.py b/gramps/gen/filters/_filterparser.py index df531fa05..85a2f9c6e 100644 --- a/gramps/gen/filters/_filterparser.py +++ b/gramps/gen/filters/_filterparser.py @@ -23,8 +23,6 @@ # Standard Python modules # #------------------------------------------------------------------------- -from __future__ import print_function, unicode_literals - from xml.sax import handler from ..const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext diff --git a/gramps/gen/filters/_genericfilter.py b/gramps/gen/filters/_genericfilter.py index 7eb78b037..a69bd3119 100644 --- a/gramps/gen/filters/_genericfilter.py +++ b/gramps/gen/filters/_genericfilter.py @@ -23,7 +23,6 @@ """ Package providing filtering framework for GRAMPS. """ -from __future__ import with_statement #------------------------------------------------------------------------ # diff --git a/gramps/gen/git_revision.py b/gramps/gen/git_revision.py index 8683f21e1..b9cc2648a 100644 --- a/gramps/gen/git_revision.py +++ b/gramps/gen/git_revision.py @@ -19,8 +19,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import unicode_literals - import sys import subprocess diff --git a/gramps/gen/lib/date.py b/gramps/gen/lib/date.py index 8a672242e..39a61e98c 100644 --- a/gramps/gen/lib/date.py +++ b/gramps/gen/lib/date.py @@ -23,13 +23,6 @@ """Support for dates.""" -#------------------------------------------------------------------------ -# -# Python modules -# -#------------------------------------------------------------------------ -from __future__ import unicode_literals, division - #------------------------------------------------------------------------ # # Set up logging diff --git a/gramps/gen/lib/gcalendar.py b/gramps/gen/lib/gcalendar.py index 4ef25df07..db4f85d41 100644 --- a/gramps/gen/lib/gcalendar.py +++ b/gramps/gen/lib/gcalendar.py @@ -21,7 +21,7 @@ """ Provide calendar to sdn (serial date number) conversion. """ -from __future__ import division, print_function + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/lib/grampstype.py b/gramps/gen/lib/grampstype.py index b0e05389a..23d2af50d 100644 --- a/gramps/gen/lib/grampstype.py +++ b/gramps/gen/lib/grampstype.py @@ -23,13 +23,6 @@ Base type for all gramps types. """ -#------------------------------------------------------------------------ -# -# Python modules -# -#------------------------------------------------------------------------ -from __future__ import unicode_literals - #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/gen/lib/person.py b/gramps/gen/lib/person.py index 8d1705076..7bde992a5 100644 --- a/gramps/gen/lib/person.py +++ b/gramps/gen/lib/person.py @@ -24,7 +24,6 @@ """ Person object for Gramps. """ -from __future__ import unicode_literals #------------------------------------------------------------------------- # diff --git a/gramps/gen/lib/place.py b/gramps/gen/lib/place.py index 0dc98ada5..9f25d90ab 100644 --- a/gramps/gen/lib/place.py +++ b/gramps/gen/lib/place.py @@ -24,7 +24,6 @@ """ Place object for Gramps. """ -from __future__ import unicode_literals #------------------------------------------------------------------------- # diff --git a/gramps/gen/lib/styledtext.py b/gramps/gen/lib/styledtext.py index 744a0037c..97a0ce93d 100644 --- a/gramps/gen/lib/styledtext.py +++ b/gramps/gen/lib/styledtext.py @@ -21,8 +21,6 @@ "Handling formatted ('rich text') strings" -from __future__ import print_function - #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/gen/lib/tableobj.py b/gramps/gen/lib/tableobj.py index 77c794e94..01575fbe9 100644 --- a/gramps/gen/lib/tableobj.py +++ b/gramps/gen/lib/tableobj.py @@ -28,7 +28,6 @@ Table Object class for Gramps. # standard python modules # #------------------------------------------------------------------------- -from __future__ import unicode_literals import time #------------------------------------------------------------------------- diff --git a/gramps/gen/merge/test/merge_ref_test.py b/gramps/gen/merge/test/merge_ref_test.py index 6ed6372b4..416e975f4 100644 --- a/gramps/gen/merge/test/merge_ref_test.py +++ b/gramps/gen/merge/test/merge_ref_test.py @@ -22,8 +22,6 @@ Unittest that tests that part of the merge process that influences other objects than the objects merging. """ -from __future__ import print_function, unicode_literals - import unittest import time import os diff --git a/gramps/gen/plug/_gramplet.py b/gramps/gen/plug/_gramplet.py index 9cf872b94..8ded5d66d 100644 --- a/gramps/gen/plug/_gramplet.py +++ b/gramps/gen/plug/_gramplet.py @@ -24,8 +24,6 @@ # Python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import sys import types diff --git a/gramps/gen/plug/_manager.py b/gramps/gen/plug/_manager.py index 7279d4a80..776a83589 100644 --- a/gramps/gen/plug/_manager.py +++ b/gramps/gen/plug/_manager.py @@ -35,8 +35,6 @@ importers, exporters, quick reports, and document generators. # Standard Python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import os import sys import re diff --git a/gramps/gen/plug/_options.py b/gramps/gen/plug/_options.py index 1be7a249e..ab73825f4 100644 --- a/gramps/gen/plug/_options.py +++ b/gramps/gen/plug/_options.py @@ -31,7 +31,6 @@ General option handling, including saving and parsing. # Standard Python modules # #------------------------------------------------------------------------- -from __future__ import print_function, unicode_literals import os, io import sys diff --git a/gramps/gen/plug/_pluginreg.py b/gramps/gen/plug/_pluginreg.py index 26b1a0150..aa00a9b7a 100644 --- a/gramps/gen/plug/_pluginreg.py +++ b/gramps/gen/plug/_pluginreg.py @@ -29,8 +29,6 @@ and a register for the data of all plugins . # Standard Python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import os import sys import re diff --git a/gramps/gen/plug/docbackend/docbackend.py b/gramps/gen/plug/docbackend/docbackend.py index a4a34b7ec..85a17ad0a 100644 --- a/gramps/gen/plug/docbackend/docbackend.py +++ b/gramps/gen/plug/docbackend/docbackend.py @@ -26,8 +26,6 @@ # Python modules # #------------------------------------------------------------------------ -from __future__ import print_function - from ...const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext import io diff --git a/gramps/gen/plug/docgen/graphdoc.py b/gramps/gen/plug/docgen/graphdoc.py index 9e81bcd03..87452dd5a 100644 --- a/gramps/gen/plug/docgen/graphdoc.py +++ b/gramps/gen/plug/docgen/graphdoc.py @@ -29,7 +29,6 @@ # python modules # #------------------------------------------------------------------------ -from __future__ import unicode_literals import os import sys if sys.version_info[0] < 3: diff --git a/gramps/gen/plug/report/_options.py b/gramps/gen/plug/report/_options.py index 2f98acd46..4a726827a 100644 --- a/gramps/gen/plug/report/_options.py +++ b/gramps/gen/plug/report/_options.py @@ -32,7 +32,6 @@ Report option handling, including saving and parsing. # Standard Python modules # #------------------------------------------------------------------------- -from __future__ import unicode_literals import os, io import copy from xml.sax.saxutils import escape diff --git a/gramps/gen/relationship.py b/gramps/gen/relationship.py index e8e8878c9..85d84ccdb 100644 --- a/gramps/gen/relationship.py +++ b/gramps/gen/relationship.py @@ -25,8 +25,6 @@ Classes for relationships. # python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import os import logging LOG = logging.getLogger("gen.relationship") diff --git a/gramps/gen/simple/_simpleaccess.py b/gramps/gen/simple/_simpleaccess.py index 768bd3b9a..3026be2a4 100644 --- a/gramps/gen/simple/_simpleaccess.py +++ b/gramps/gen/simple/_simpleaccess.py @@ -23,8 +23,6 @@ """ Provide a simplified database access interface to the Gramps database. """ -from __future__ import with_statement, unicode_literals - from ..lib import (Person, Family, Event, Source, Place, Citation, MediaObject, Repository, Note, Date, Tag) from ..lib.handle import Handle diff --git a/gramps/gen/test/constfunc_test.py b/gramps/gen/test/constfunc_test.py index 414b4254e..fa22c60d6 100644 --- a/gramps/gen/test/constfunc_test.py +++ b/gramps/gen/test/constfunc_test.py @@ -21,8 +21,6 @@ """ Unittest for constfunc.py """ -from __future__ import print_function - import unittest from .. import constfunc diff --git a/gramps/gen/test/user_test.py b/gramps/gen/test/user_test.py index 96f9ac2da..7d0880744 100644 --- a/gramps/gen/test/user_test.py +++ b/gramps/gen/test/user_test.py @@ -21,8 +21,6 @@ """ Unittest for user.py """ -from __future__ import print_function - import unittest from .. import user diff --git a/gramps/gen/updatecallback.py b/gramps/gen/updatecallback.py index 06e98f3e9..3853b1862 100644 --- a/gramps/gen/updatecallback.py +++ b/gramps/gen/updatecallback.py @@ -25,7 +25,7 @@ The goal is to have this module not depend on any other gramps module. That way, e.g. database classes can safely depend on that without other Gramps baggage. """ -from __future__ import division + #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gen/utils/configmanager.py b/gramps/gen/utils/configmanager.py index 47382dc5a..5b1161594 100644 --- a/gramps/gen/utils/configmanager.py +++ b/gramps/gen/utils/configmanager.py @@ -29,7 +29,6 @@ This package implements access to Gramps configuration. # System imports # #--------------------------------------------------------------- -from __future__ import print_function, unicode_literals import os import sys import time diff --git a/gramps/gen/utils/debug.py b/gramps/gen/utils/debug.py index 8b2262761..be608c8ae 100644 --- a/gramps/gen/utils/debug.py +++ b/gramps/gen/utils/debug.py @@ -24,8 +24,6 @@ Debugging utilities """ -from __future__ import print_function - #------------------------------------------------------------------------- # # Debugging utilities diff --git a/gramps/gen/utils/grampslocale.py b/gramps/gen/utils/grampslocale.py index af558776c..fb59f685c 100644 --- a/gramps/gen/utils/grampslocale.py +++ b/gramps/gen/utils/grampslocale.py @@ -25,8 +25,6 @@ # python modules # #------------------------------------------------------------------------ -# If you enable unicode_literals, some stuff needs fixing for win+py2, see #7162 -#from __future__ import print_function, unicode_literals import gettext import sys import os diff --git a/gramps/gen/utils/place.py b/gramps/gen/utils/place.py index 7ba36d47d..d9486e2a1 100644 --- a/gramps/gen/utils/place.py +++ b/gramps/gen/utils/place.py @@ -27,8 +27,6 @@ # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function, unicode_literals - from ..const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext import math diff --git a/gramps/gen/utils/resourcepath.py b/gramps/gen/utils/resourcepath.py index 52fe9faa8..36c6d6b88 100644 --- a/gramps/gen/utils/resourcepath.py +++ b/gramps/gen/utils/resourcepath.py @@ -17,7 +17,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import unicode_literals import sys import io import os diff --git a/gramps/gen/utils/test/grampslocale_test.py b/gramps/gen/utils/test/grampslocale_test.py index 8601c8dca..a161afbb7 100644 --- a/gramps/gen/utils/test/grampslocale_test.py +++ b/gramps/gen/utils/test/grampslocale_test.py @@ -19,8 +19,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import print_function, unicode_literals - import unittest import sys diff --git a/gramps/gen/utils/test/place_test.py b/gramps/gen/utils/test/place_test.py index 313caede1..16e468414 100644 --- a/gramps/gen/utils/test/place_test.py +++ b/gramps/gen/utils/test/place_test.py @@ -21,8 +21,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import unicode_literals - #------------------------------------------------------------------------- # # Standard python modules diff --git a/gramps/gui/aboutdialog.py b/gramps/gui/aboutdialog.py index 6fc157c86..12417055c 100644 --- a/gramps/gui/aboutdialog.py +++ b/gramps/gui/aboutdialog.py @@ -25,9 +25,6 @@ # Python modules # #------------------------------------------------------------------------- - -from __future__ import unicode_literals - import os import sys import io diff --git a/gramps/gui/autocomp.py b/gramps/gui/autocomp.py index f969a6c5f..a1e4ce617 100644 --- a/gramps/gui/autocomp.py +++ b/gramps/gui/autocomp.py @@ -22,13 +22,6 @@ Provide autocompletion functionality. """ -#------------------------------------------------------------------------- -# -# Standard python modules -# -#------------------------------------------------------------------------- -from __future__ import print_function - #------------------------------------------------------------------------- # # GNOME modules diff --git a/gramps/gui/configure.py b/gramps/gui/configure.py index e1b2a0930..dae4cf72a 100644 --- a/gramps/gui/configure.py +++ b/gramps/gui/configure.py @@ -27,8 +27,6 @@ # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import random import os from xml.sax.saxutils import escape diff --git a/gramps/gui/ddtargets.py b/gramps/gui/ddtargets.py index b18dc22dc..6ff7532cc 100644 --- a/gramps/gui/ddtargets.py +++ b/gramps/gui/ddtargets.py @@ -45,8 +45,6 @@ """ -from __future__ import print_function - #------------------------------------------------------------------------- # # set up logging diff --git a/gramps/gui/editors/displaytabs/buttontab.py b/gramps/gui/editors/displaytabs/buttontab.py index 63ce882dd..0d97134c5 100644 --- a/gramps/gui/editors/displaytabs/buttontab.py +++ b/gramps/gui/editors/displaytabs/buttontab.py @@ -24,8 +24,6 @@ # Python classes # #------------------------------------------------------------------------- -from __future__ import print_function - from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext diff --git a/gramps/gui/editors/editdate.py b/gramps/gui/editors/editdate.py index 037890764..e087f9edc 100644 --- a/gramps/gui/editors/editdate.py +++ b/gramps/gui/editors/editdate.py @@ -31,8 +31,6 @@ The DateEditor provides a dialog in which the date can be unambiguously built using UI controls such as menus and spin buttons. """ -from __future__ import unicode_literals - #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gui/editors/editplace.py b/gramps/gui/editors/editplace.py index eaecdc397..00486cf09 100644 --- a/gramps/gui/editors/editplace.py +++ b/gramps/gui/editors/editplace.py @@ -26,8 +26,6 @@ # python modules # #------------------------------------------------------------------------- -from __future__ import unicode_literals - from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.sgettext import logging diff --git a/gramps/gui/grampsgui.py b/gramps/gui/grampsgui.py index aef318cd5..ad250839a 100644 --- a/gramps/gui/grampsgui.py +++ b/gramps/gui/grampsgui.py @@ -24,8 +24,6 @@ # Python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import sys import os import logging diff --git a/gramps/gui/logger/_errorreportassistant.py b/gramps/gui/logger/_errorreportassistant.py index a39c83bbe..b1d94455a 100644 --- a/gramps/gui/logger/_errorreportassistant.py +++ b/gramps/gui/logger/_errorreportassistant.py @@ -24,8 +24,6 @@ # Python modules # #------------------------------------------------------------------------- -from __future__ import unicode_literals - from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GdkPixbuf diff --git a/gramps/gui/managedwindow.py b/gramps/gui/managedwindow.py index 73added8c..5ae5b3184 100644 --- a/gramps/gui/managedwindow.py +++ b/gramps/gui/managedwindow.py @@ -29,8 +29,6 @@ the create/deletion of dialog windows. # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import os import sys if sys.version_info[0] < 3: diff --git a/gramps/gui/plug/_guioptions.py b/gramps/gui/plug/_guioptions.py index 42aab92de..b24325d67 100644 --- a/gramps/gui/plug/_guioptions.py +++ b/gramps/gui/plug/_guioptions.py @@ -27,7 +27,6 @@ """ Specific option handling for a GUI. """ -from __future__ import unicode_literals #------------------------------------------------------------------------ # diff --git a/gramps/gui/plug/_windows.py b/gramps/gui/plug/_windows.py index 26c0a1522..70c753f24 100644 --- a/gramps/gui/plug/_windows.py +++ b/gramps/gui/plug/_windows.py @@ -26,8 +26,6 @@ # Python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import traceback import os import sys diff --git a/gramps/gui/plug/quick/_quickreports.py b/gramps/gui/plug/quick/_quickreports.py index 11d5d380d..cfba03200 100644 --- a/gramps/gui/plug/quick/_quickreports.py +++ b/gramps/gui/plug/quick/_quickreports.py @@ -29,8 +29,6 @@ This module provides the functions to build the quick report context menu's # python modules # #------------------------------------------------------------------------ -from __future__ import print_function - from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext import sys diff --git a/gramps/gui/plug/quick/_quicktable.py b/gramps/gui/plug/quick/_quicktable.py index d42d73ccf..e3e07d3c1 100644 --- a/gramps/gui/plug/quick/_quicktable.py +++ b/gramps/gui/plug/quick/_quicktable.py @@ -29,8 +29,6 @@ Provide a simplified table creation interface # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import sys if sys.version_info[0] < 3: import cPickle as pickle diff --git a/gramps/gui/plug/report/_bookdialog.py b/gramps/gui/plug/report/_bookdialog.py index d7c48e558..770d02dca 100644 --- a/gramps/gui/plug/report/_bookdialog.py +++ b/gramps/gui/plug/report/_bookdialog.py @@ -30,8 +30,6 @@ # Standard Python modules # #------------------------------------------------------------------------- -from __future__ import print_function - from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext diff --git a/gramps/gui/plug/tool.py b/gramps/gui/plug/tool.py index f543dec73..43635dbb7 100644 --- a/gramps/gui/plug/tool.py +++ b/gramps/gui/plug/tool.py @@ -27,8 +27,6 @@ # Python modules # #------------------------------------------------------------------------- -from __future__ import print_function - from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext import logging diff --git a/gramps/gui/test/user_test.py b/gramps/gui/test/user_test.py index 954465310..bca171a17 100644 --- a/gramps/gui/test/user_test.py +++ b/gramps/gui/test/user_test.py @@ -21,8 +21,6 @@ """ Unittest for user.py """ -from __future__ import print_function - import unittest from .. import user from ...gen.test.user_test import TestUser diff --git a/gramps/gui/utils.py b/gramps/gui/utils.py index e72752cf7..cc6972413 100644 --- a/gramps/gui/utils.py +++ b/gramps/gui/utils.py @@ -22,8 +22,6 @@ Utility functions that depend on GUI components or for GUI components """ -from __future__ import print_function, division - #------------------------------------------------------------------------- # # Standard python modules diff --git a/gramps/gui/utilscairo.py b/gramps/gui/utilscairo.py index 2057c7f08..d1c830700 100644 --- a/gramps/gui/utilscairo.py +++ b/gramps/gui/utilscairo.py @@ -21,8 +21,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import division - #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gui/viewmanager.py b/gramps/gui/viewmanager.py index 7b5493abc..3febeb4b6 100644 --- a/gramps/gui/viewmanager.py +++ b/gramps/gui/viewmanager.py @@ -33,8 +33,6 @@ Manages the main window and the pluggable views # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function, unicode_literals - from collections import defaultdict import os import sys diff --git a/gramps/gui/views/treemodels/flatbasemodel.py b/gramps/gui/views/treemodels/flatbasemodel.py index 2ea4401e0..a58b57a4d 100644 --- a/gramps/gui/views/treemodels/flatbasemodel.py +++ b/gramps/gui/views/treemodels/flatbasemodel.py @@ -51,8 +51,6 @@ It keeps a FlatNodeMap, and obtains data from database as needed # python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import logging import bisect import sys diff --git a/gramps/gui/widgets/fanchart.py b/gramps/gui/widgets/fanchart.py index 002cecc62..d6c2a5abf 100644 --- a/gramps/gui/widgets/fanchart.py +++ b/gramps/gui/widgets/fanchart.py @@ -29,8 +29,6 @@ ## Found by redwood: ## http://www.gramps-project.org/bugs/view.php?id=2611 -from __future__ import division - #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gui/widgets/fanchartdesc.py b/gramps/gui/widgets/fanchartdesc.py index 9dc9ef167..bf923654c 100644 --- a/gramps/gui/widgets/fanchartdesc.py +++ b/gramps/gui/widgets/fanchartdesc.py @@ -28,8 +28,6 @@ ## Found by redwood: ## http://www.gramps-project.org/bugs/view.php?id=2611 -from __future__ import division - #------------------------------------------------------------------------- # # Python modules diff --git a/gramps/gui/widgets/grampletbar.py b/gramps/gui/widgets/grampletbar.py index 71d5f9012..ed57f7d3a 100644 --- a/gramps/gui/widgets/grampletbar.py +++ b/gramps/gui/widgets/grampletbar.py @@ -23,7 +23,6 @@ """ Module that implements the gramplet bar fuctionality. """ -from __future__ import unicode_literals #------------------------------------------------------------------------- # diff --git a/gramps/gui/widgets/grampletpane.py b/gramps/gui/widgets/grampletpane.py index 28bd86591..cb2bcb894 100644 --- a/gramps/gui/widgets/grampletpane.py +++ b/gramps/gui/widgets/grampletpane.py @@ -28,8 +28,6 @@ GrampletView interface. # Python modules # #------------------------------------------------------------------------- -from __future__ import print_function, unicode_literals - from gi.repository import GObject from gi.repository import Gdk from gi.repository import Gtk diff --git a/gramps/gui/widgets/progressdialog.py b/gramps/gui/widgets/progressdialog.py index 53c28b23f..836d1fb54 100644 --- a/gramps/gui/widgets/progressdialog.py +++ b/gramps/gui/widgets/progressdialog.py @@ -21,7 +21,7 @@ This module provides a progress dialog for displaying the status of long running operations. """ -from __future__ import print_function + #------------------------------------------------------------------------- # # Standard python modules diff --git a/gramps/gui/widgets/selectionwidget.py b/gramps/gui/widgets/selectionwidget.py index 762776dbc..65e20ef36 100644 --- a/gramps/gui/widgets/selectionwidget.py +++ b/gramps/gui/widgets/selectionwidget.py @@ -18,13 +18,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -#------------------------------------------------------------------------- -# -# Standard python modules -# -#------------------------------------------------------------------------- -from __future__ import division - #------------------------------------------------------------------------- # # GTK/Gnome modules diff --git a/gramps/gui/widgets/undoablebuffer.py b/gramps/gui/widgets/undoablebuffer.py index 78786f6b3..11cfd9794 100644 --- a/gramps/gui/widgets/undoablebuffer.py +++ b/gramps/gui/widgets/undoablebuffer.py @@ -23,8 +23,6 @@ """ gtk textbuffer with undo functionality """ -from __future__ import print_function - __all__ = ["UndoableBuffer"] # Originally LGLP from: diff --git a/gramps/guiQML/grampsqml.py b/gramps/guiQML/grampsqml.py index 2dcf4d211..136d38f89 100644 --- a/gramps/guiQML/grampsqml.py +++ b/gramps/guiQML/grampsqml.py @@ -26,8 +26,6 @@ main file to start the QML application # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import sys, os #------------------------------------------------------------------------- diff --git a/gramps/guiQML/views/centralview.py b/gramps/guiQML/views/centralview.py index 70b06b0b0..fe4ae0823 100644 --- a/gramps/guiQML/views/centralview.py +++ b/gramps/guiQML/views/centralview.py @@ -22,8 +22,6 @@ The main view from where other views are started """ -from __future__ import print_function - #------------------------------------------------------------------------- # # Constants diff --git a/gramps/guiQML/views/dbman.py b/gramps/guiQML/views/dbman.py index be43951b8..9a6cb55ff 100644 --- a/gramps/guiQML/views/dbman.py +++ b/gramps/guiQML/views/dbman.py @@ -26,8 +26,6 @@ The main view # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import sys, os #------------------------------------------------------------------------- diff --git a/gramps/guiQML/views/personview.py b/gramps/guiQML/views/personview.py index 7a7914a8d..785ebb834 100644 --- a/gramps/guiQML/views/personview.py +++ b/gramps/guiQML/views/personview.py @@ -27,8 +27,6 @@ The listview with all people in the database # Standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import sys, os #------------------------------------------------------------------------- diff --git a/gramps/plugins/docgen/asciidoc.py b/gramps/plugins/docgen/asciidoc.py index 1cd680219..f4fb48108 100644 --- a/gramps/plugins/docgen/asciidoc.py +++ b/gramps/plugins/docgen/asciidoc.py @@ -28,9 +28,9 @@ # python modules # #------------------------------------------------------------------------ -from __future__ import unicode_literals import io import sys + #------------------------------------------------------------------------ # # Gramps modules diff --git a/gramps/plugins/docgen/gtkprint.py b/gramps/plugins/docgen/gtkprint.py index f47200ec5..de9259293 100644 --- a/gramps/plugins/docgen/gtkprint.py +++ b/gramps/plugins/docgen/gtkprint.py @@ -21,7 +21,7 @@ """Printing interface based on Gtk.Print* classes. """ -from __future__ import division + #------------------------------------------------------------------------ # # Python modules diff --git a/gramps/plugins/docgen/latexdoc.py b/gramps/plugins/docgen/latexdoc.py index a84d1ce87..7f1910eb7 100644 --- a/gramps/plugins/docgen/latexdoc.py +++ b/gramps/plugins/docgen/latexdoc.py @@ -35,7 +35,6 @@ # python modules # #------------------------------------------------------------------------ -from __future__ import unicode_literals from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext from bisect import bisect diff --git a/gramps/plugins/docgen/rtfdoc.py b/gramps/plugins/docgen/rtfdoc.py index 5a9d1bbbd..82be89eb6 100644 --- a/gramps/plugins/docgen/rtfdoc.py +++ b/gramps/plugins/docgen/rtfdoc.py @@ -27,8 +27,6 @@ # python modules # #------------------------------------------------------------------------ -from __future__ import print_function - from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext import logging diff --git a/gramps/plugins/drawreport/ancestortree.py b/gramps/plugins/drawreport/ancestortree.py index 9f9d1a92f..9fb6b90d7 100644 --- a/gramps/plugins/drawreport/ancestortree.py +++ b/gramps/plugins/drawreport/ancestortree.py @@ -28,7 +28,6 @@ # Python modules # #------------------------------------------------------------------------ -from __future__ import division import math def log2(val): """ diff --git a/gramps/plugins/drawreport/calendarreport.py b/gramps/plugins/drawreport/calendarreport.py index 24bdeae64..ee8850da2 100644 --- a/gramps/plugins/drawreport/calendarreport.py +++ b/gramps/plugins/drawreport/calendarreport.py @@ -24,7 +24,6 @@ # python modules # #------------------------------------------------------------------------ -from __future__ import unicode_literals from functools import partial import datetime import time diff --git a/gramps/plugins/drawreport/descendtree.py b/gramps/plugins/drawreport/descendtree.py index 26f709b94..ca7617c8a 100644 --- a/gramps/plugins/drawreport/descendtree.py +++ b/gramps/plugins/drawreport/descendtree.py @@ -27,13 +27,6 @@ Reports/Graphical Reports/Familial Tree Reports/Graphical Reports/Personal Tree """ -#------------------------------------------------------------------------ -# -# Python modules -# -#------------------------------------------------------------------------ -from __future__ import division - #------------------------------------------------------------------------ # # GRAMPS modules diff --git a/gramps/plugins/drawreport/statisticschart.py b/gramps/plugins/drawreport/statisticschart.py index fe5759641..9d9cd6de7 100644 --- a/gramps/plugins/drawreport/statisticschart.py +++ b/gramps/plugins/drawreport/statisticschart.py @@ -31,7 +31,6 @@ # python modules # #------------------------------------------------------------------------ -from __future__ import division import time from functools import partial diff --git a/gramps/plugins/drawreport/timeline.py b/gramps/plugins/drawreport/timeline.py index bb2b1f2cb..7416c17f5 100644 --- a/gramps/plugins/drawreport/timeline.py +++ b/gramps/plugins/drawreport/timeline.py @@ -25,13 +25,6 @@ Timeline Chart """ -#------------------------------------------------------------------------ -# -# python modules -# -#------------------------------------------------------------------------ -from __future__ import division - #------------------------------------------------------------------------ # # GRAMPS modules diff --git a/gramps/plugins/export/exportcsv.py b/gramps/plugins/export/exportcsv.py index 6a20b79f6..2236029b7 100644 --- a/gramps/plugins/export/exportcsv.py +++ b/gramps/plugins/export/exportcsv.py @@ -25,8 +25,6 @@ "Export to CSV Spreadsheet." - -from __future__ import unicode_literals #------------------------------------------------------------------------- # # Standard Python Modules diff --git a/gramps/plugins/export/test/exportvcard_test.py b/gramps/plugins/export/test/exportvcard_test.py index 82a274591..f952e42d4 100644 --- a/gramps/plugins/export/test/exportvcard_test.py +++ b/gramps/plugins/export/test/exportvcard_test.py @@ -21,8 +21,6 @@ """ Unittest for export to VCard """ -from __future__ import print_function - import unittest import time import subprocess diff --git a/gramps/plugins/gramplet/pedigreegramplet.py b/gramps/plugins/gramplet/pedigreegramplet.py index 5b7d7c052..6d70baa89 100644 --- a/gramps/plugins/gramplet/pedigreegramplet.py +++ b/gramps/plugins/gramplet/pedigreegramplet.py @@ -22,8 +22,6 @@ # Python modules # #------------------------------------------------------------------------ -from __future__ import unicode_literals - import cgi #------------------------------------------------------------------------ diff --git a/gramps/plugins/graph/gvfamilylines.py b/gramps/plugins/graph/gvfamilylines.py index 3b97020cc..c8fb96e0d 100644 --- a/gramps/plugins/graph/gvfamilylines.py +++ b/gramps/plugins/graph/gvfamilylines.py @@ -32,7 +32,6 @@ Family Lines, a GraphViz-based plugin for Gramps. # python modules # #------------------------------------------------------------------------ -from __future__ import unicode_literals from functools import partial #------------------------------------------------------------------------ diff --git a/gramps/plugins/importer/importcsv.py b/gramps/plugins/importer/importcsv.py index bf3a229ee..5d76e815f 100644 --- a/gramps/plugins/importer/importcsv.py +++ b/gramps/plugins/importer/importcsv.py @@ -24,7 +24,6 @@ "Import from CSV Spreadsheet" -from __future__ import unicode_literals #------------------------------------------------------------------------- # # Standard Python Modules diff --git a/gramps/plugins/importer/importgeneweb.py b/gramps/plugins/importer/importgeneweb.py index d3ae9b7d3..0fe72987e 100644 --- a/gramps/plugins/importer/importgeneweb.py +++ b/gramps/plugins/importer/importgeneweb.py @@ -27,8 +27,6 @@ # standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function - import re import time import sys diff --git a/gramps/plugins/importer/importprogen.py b/gramps/plugins/importer/importprogen.py index a1978303f..584a3281e 100644 --- a/gramps/plugins/importer/importprogen.py +++ b/gramps/plugins/importer/importprogen.py @@ -22,7 +22,6 @@ "Import from Pro-Gen" -from __future__ import print_function, unicode_literals #------------------------------------------------------------------------- # # standard python modules diff --git a/gramps/plugins/importer/importxml.py b/gramps/plugins/importer/importxml.py index 578faa102..b5e9f0de6 100644 --- a/gramps/plugins/importer/importxml.py +++ b/gramps/plugins/importer/importxml.py @@ -28,7 +28,6 @@ # Standard Python Modules # #------------------------------------------------------------------------- -from __future__ import unicode_literals import os import sys import time diff --git a/gramps/plugins/importer/test/importgeneweb_test.py b/gramps/plugins/importer/test/importgeneweb_test.py index 43a18bd4e..1ce925923 100644 --- a/gramps/plugins/importer/test/importgeneweb_test.py +++ b/gramps/plugins/importer/test/importgeneweb_test.py @@ -21,7 +21,6 @@ """ Unit test of the GeneWebParser """ -from __future__ import print_function import unittest from ..importgeneweb import GeneWebParser from ....gen.lib.date import Date diff --git a/gramps/plugins/importer/test/importvcard_test.py b/gramps/plugins/importer/test/importvcard_test.py index e42f03187..d1f4fc226 100644 --- a/gramps/plugins/importer/test/importvcard_test.py +++ b/gramps/plugins/importer/test/importvcard_test.py @@ -24,8 +24,6 @@ Unittest of import of VCard # in case of a failing test, add True as last parameter to do_case to see the output. -from __future__ import print_function - import unittest import time import subprocess diff --git a/gramps/plugins/importer/test/importxml_test.py b/gramps/plugins/importer/test/importxml_test.py index 9c7be7a5a..cbe29535b 100644 --- a/gramps/plugins/importer/test/importxml_test.py +++ b/gramps/plugins/importer/test/importxml_test.py @@ -21,8 +21,6 @@ """ Test XML import. """ -from __future__ import print_function, unicode_literals - import unittest import time import os diff --git a/gramps/plugins/lib/libcairodoc.py b/gramps/plugins/lib/libcairodoc.py index 22e1f4651..3b64da968 100644 --- a/gramps/plugins/lib/libcairodoc.py +++ b/gramps/plugins/lib/libcairodoc.py @@ -28,7 +28,6 @@ """Report output generator based on Cairo. """ -from __future__ import division, print_function #------------------------------------------------------------------------ # # Python modules diff --git a/gramps/plugins/lib/libgedcom.py b/gramps/plugins/lib/libgedcom.py index 398db6412..48db9c536 100644 --- a/gramps/plugins/lib/libgedcom.py +++ b/gramps/plugins/lib/libgedcom.py @@ -87,8 +87,6 @@ all lines until the next level 2 token is found (in this case, skipping the # standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function, unicode_literals - import os import sys import re diff --git a/gramps/plugins/lib/libholiday.py b/gramps/plugins/lib/libholiday.py index 0281231c8..c8073f0e7 100644 --- a/gramps/plugins/lib/libholiday.py +++ b/gramps/plugins/lib/libholiday.py @@ -23,7 +23,6 @@ # python modules # #------------------------------------------------------------------------ -from __future__ import print_function from xml.parsers import expat import datetime import math diff --git a/gramps/plugins/lib/libhtml.py b/gramps/plugins/lib/libhtml.py index dac980655..6be3a99fe 100644 --- a/gramps/plugins/lib/libhtml.py +++ b/gramps/plugins/lib/libhtml.py @@ -27,7 +27,6 @@ This module exports the Html class """ -from __future__ import print_function #------------------------------------------------------------------------ # Python modules #------------------------------------------------------------------------ diff --git a/gramps/plugins/lib/libplaceview.py b/gramps/plugins/lib/libplaceview.py index fc61b13ff..cfa8e98ae 100644 --- a/gramps/plugins/lib/libplaceview.py +++ b/gramps/plugins/lib/libplaceview.py @@ -24,13 +24,6 @@ Base view for Place Views """ -#------------------------------------------------------------------------- -# -# Global modules -# -#------------------------------------------------------------------------- -from __future__ import print_function - #------------------------------------------------------------------------- # # GTK/Gnome modules diff --git a/gramps/plugins/lib/libsubstkeyword.py b/gramps/plugins/lib/libsubstkeyword.py index f066d8ca5..e6d1b1ea1 100644 --- a/gramps/plugins/lib/libsubstkeyword.py +++ b/gramps/plugins/lib/libsubstkeyword.py @@ -33,13 +33,6 @@ Will return a value such as: Mary Smith was born on 3/28/1923. """ -#------------------------------------------------------------------------ -# -# Python modules -# -#------------------------------------------------------------------------ -from __future__ import print_function - #------------------------------------------------------------------------ # # Gramps modules diff --git a/gramps/plugins/lib/libtreebase.py b/gramps/plugins/lib/libtreebase.py index ab5003a8d..76222de62 100644 --- a/gramps/plugins/lib/libtreebase.py +++ b/gramps/plugins/lib/libtreebase.py @@ -21,13 +21,6 @@ """Reports/Graphical Reports/Tree_Base""" -#------------------------------------------------------------------------ -# -# Python modules -# -#------------------------------------------------------------------------ -from __future__ import division - #------------------------------------------------------------------------ # # Gramps modules diff --git a/gramps/plugins/rel/rel_ca.py b/gramps/plugins/rel/rel_ca.py index 51e9271a7..eea314d11 100644 --- a/gramps/plugins/rel/rel_ca.py +++ b/gramps/plugins/rel/rel_ca.py @@ -30,7 +30,6 @@ http://www.scgenealogia.org/pdf/Denominacions%20dels%20Parentius.pdf The only invented name is "cosinastre". Also, "besnetastre" and the like are not explicitly in the dictionary, but "netastre" is. """ -from __future__ import unicode_literals #------------------------------------------------------------------------- # diff --git a/gramps/plugins/rel/rel_cs.py b/gramps/plugins/rel/rel_cs.py index 078e583a5..90dc98359 100644 --- a/gramps/plugins/rel/rel_cs.py +++ b/gramps/plugins/rel/rel_cs.py @@ -25,7 +25,7 @@ """ Czech-specific classes for relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_da.py b/gramps/plugins/rel/rel_da.py index 7573bbdc1..53865455d 100644 --- a/gramps/plugins/rel/rel_da.py +++ b/gramps/plugins/rel/rel_da.py @@ -26,7 +26,7 @@ """ Specific classes for relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_de.py b/gramps/plugins/rel/rel_de.py index ffabe8f29..830cd7f76 100644 --- a/gramps/plugins/rel/rel_de.py +++ b/gramps/plugins/rel/rel_de.py @@ -30,7 +30,7 @@ """ German-specific classes for relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # standard python modules diff --git a/gramps/plugins/rel/rel_es.py b/gramps/plugins/rel/rel_es.py index 69dee1e69..fcbfcd9ed 100644 --- a/gramps/plugins/rel/rel_es.py +++ b/gramps/plugins/rel/rel_es.py @@ -24,7 +24,7 @@ """ Spanish-specific classes for relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_fi.py b/gramps/plugins/rel/rel_fi.py index 2d406d5b6..280975f75 100644 --- a/gramps/plugins/rel/rel_fi.py +++ b/gramps/plugins/rel/rel_fi.py @@ -26,7 +26,7 @@ """ Specific classes for relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_fr.py b/gramps/plugins/rel/rel_fr.py index 57c6ef29c..3d675b091 100644 --- a/gramps/plugins/rel/rel_fr.py +++ b/gramps/plugins/rel/rel_fr.py @@ -24,7 +24,7 @@ """ French-specific classes for relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_hr.py b/gramps/plugins/rel/rel_hr.py index d5d818389..80348a28a 100644 --- a/gramps/plugins/rel/rel_hr.py +++ b/gramps/plugins/rel/rel_hr.py @@ -23,7 +23,7 @@ """ Croatian-specific classes for calculating relationships and kinship names. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_hu.py b/gramps/plugins/rel/rel_hu.py index 750ea4a3b..7abe8cfab 100644 --- a/gramps/plugins/rel/rel_hu.py +++ b/gramps/plugins/rel/rel_hu.py @@ -26,7 +26,7 @@ """ Specific classes for relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_it.py b/gramps/plugins/rel/rel_it.py index 1974009ff..ab7f818fe 100644 --- a/gramps/plugins/rel/rel_it.py +++ b/gramps/plugins/rel/rel_it.py @@ -29,7 +29,7 @@ """ Italian-Specific classes for relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_nl.py b/gramps/plugins/rel/rel_nl.py index a671e1b93..67909d73c 100644 --- a/gramps/plugins/rel/rel_nl.py +++ b/gramps/plugins/rel/rel_nl.py @@ -22,7 +22,7 @@ """ Specific classes for relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_no.py b/gramps/plugins/rel/rel_no.py index 750e98c94..3edb2d12d 100644 --- a/gramps/plugins/rel/rel_no.py +++ b/gramps/plugins/rel/rel_no.py @@ -26,7 +26,7 @@ """ Norwegian-Specific classes for relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_pl.py b/gramps/plugins/rel/rel_pl.py index 7985d7271..97a35a32f 100644 --- a/gramps/plugins/rel/rel_pl.py +++ b/gramps/plugins/rel/rel_pl.py @@ -29,7 +29,7 @@ """ Polish-specific definitions of relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_pt.py b/gramps/plugins/rel/rel_pt.py index 78582bdfd..368937f5e 100644 --- a/gramps/plugins/rel/rel_pt.py +++ b/gramps/plugins/rel/rel_pt.py @@ -26,7 +26,7 @@ """ Specific classes for relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_ru.py b/gramps/plugins/rel/rel_ru.py index dc948fe86..0f01ba80a 100644 --- a/gramps/plugins/rel/rel_ru.py +++ b/gramps/plugins/rel/rel_ru.py @@ -25,7 +25,7 @@ """ Russian-specific definitions of relationships """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_sk.py b/gramps/plugins/rel/rel_sk.py index 79f7d2322..ca96b98ab 100644 --- a/gramps/plugins/rel/rel_sk.py +++ b/gramps/plugins/rel/rel_sk.py @@ -22,7 +22,7 @@ """ Slovak-specific classes for relationships. """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_sl.py b/gramps/plugins/rel/rel_sl.py index a0863f5c6..90f11817e 100644 --- a/gramps/plugins/rel/rel_sl.py +++ b/gramps/plugins/rel/rel_sl.py @@ -25,7 +25,7 @@ """ Slovenian-specific definitions of relationships """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_sv.py b/gramps/plugins/rel/rel_sv.py index 4c15f0663..913b66e3f 100644 --- a/gramps/plugins/rel/rel_sv.py +++ b/gramps/plugins/rel/rel_sv.py @@ -28,7 +28,7 @@ """ Swedish-specific definitions of relationships """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/rel/rel_uk.py b/gramps/plugins/rel/rel_uk.py index 69077b9d5..a6d63550e 100644 --- a/gramps/plugins/rel/rel_uk.py +++ b/gramps/plugins/rel/rel_uk.py @@ -28,7 +28,7 @@ """ Ukrainian-specific definitions of relationships """ -from __future__ import unicode_literals + #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/gramps/plugins/tool/changetypes.py b/gramps/plugins/tool/changetypes.py index f0c770723..333876e54 100644 --- a/gramps/plugins/tool/changetypes.py +++ b/gramps/plugins/tool/changetypes.py @@ -22,13 +22,6 @@ """Database Processing/Rename Event Types""" -#------------------------------------------------------------------------ -# -# standard python modules -# -#------------------------------------------------------------------------ -from __future__ import print_function - #------------------------------------------------------------------------ # # GRAMPS modules diff --git a/gramps/plugins/tool/check.py b/gramps/plugins/tool/check.py index 0b13fdd70..1f070bf61 100644 --- a/gramps/plugins/tool/check.py +++ b/gramps/plugins/tool/check.py @@ -29,7 +29,6 @@ # python modules # #------------------------------------------------------------------------- -from __future__ import print_function import os import sys if sys.version_info[0] < 3: diff --git a/gramps/plugins/tool/dumpgenderstats.py b/gramps/plugins/tool/dumpgenderstats.py index d5b29e851..8c505301e 100644 --- a/gramps/plugins/tool/dumpgenderstats.py +++ b/gramps/plugins/tool/dumpgenderstats.py @@ -24,8 +24,6 @@ Tools/Debug/Dump Gender Statistics """ -from __future__ import print_function - from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext from gi.repository import Gtk diff --git a/gramps/plugins/tool/extractcity.py b/gramps/plugins/tool/extractcity.py index e7a2a6e4f..87dbe5be8 100644 --- a/gramps/plugins/tool/extractcity.py +++ b/gramps/plugins/tool/extractcity.py @@ -23,7 +23,6 @@ """Tools/Database Processing/Extract Place Data from a Place Title""" -from __future__ import unicode_literals #------------------------------------------------------------------------- # # python modules diff --git a/gramps/plugins/tool/mediamanager.py b/gramps/plugins/tool/mediamanager.py index 2af74c838..fbff8111f 100644 --- a/gramps/plugins/tool/mediamanager.py +++ b/gramps/plugins/tool/mediamanager.py @@ -31,8 +31,6 @@ # standard python modules # #------------------------------------------------------------------------ -from __future__ import print_function - import os #------------------------------------------------------------------------ diff --git a/gramps/plugins/tool/mergecitations.py b/gramps/plugins/tool/mergecitations.py index f542cdf90..d8e590d51 100644 --- a/gramps/plugins/tool/mergecitations.py +++ b/gramps/plugins/tool/mergecitations.py @@ -28,8 +28,6 @@ # Python modules # #------------------------------------------------------------------------ -from __future__ import print_function - import logging LOG = logging.getLogger(".citation") diff --git a/gramps/plugins/tool/phpgedviewconnector.py b/gramps/plugins/tool/phpgedviewconnector.py index bfb9cb315..6cc741fc0 100644 --- a/gramps/plugins/tool/phpgedviewconnector.py +++ b/gramps/plugins/tool/phpgedviewconnector.py @@ -20,8 +20,6 @@ "Download a GEDCOM file from a phpGedView server" -from __future__ import print_function - import sys if sys.version_info[0] < 3: import httplib as hcl diff --git a/gramps/plugins/tool/rebuild.py b/gramps/plugins/tool/rebuild.py index e07e19f7c..4c5a9aa7f 100644 --- a/gramps/plugins/tool/rebuild.py +++ b/gramps/plugins/tool/rebuild.py @@ -27,8 +27,6 @@ # python modules # #------------------------------------------------------------------------- -from __future__ import print_function - from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext diff --git a/gramps/plugins/tool/rebuildgenderstat.py b/gramps/plugins/tool/rebuildgenderstat.py index 9222b04b6..1d3694975 100644 --- a/gramps/plugins/tool/rebuildgenderstat.py +++ b/gramps/plugins/tool/rebuildgenderstat.py @@ -27,8 +27,6 @@ # python modules # #------------------------------------------------------------------------- -from __future__ import print_function - from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext diff --git a/gramps/plugins/tool/rebuildrefmap.py b/gramps/plugins/tool/rebuildrefmap.py index 3c8b6e6ec..c8228b3e8 100644 --- a/gramps/plugins/tool/rebuildrefmap.py +++ b/gramps/plugins/tool/rebuildrefmap.py @@ -29,8 +29,6 @@ # python modules # #------------------------------------------------------------------------- -from __future__ import print_function - from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext diff --git a/gramps/plugins/tool/removeunused.py b/gramps/plugins/tool/removeunused.py index 797bb3715..cfdcec18d 100644 --- a/gramps/plugins/tool/removeunused.py +++ b/gramps/plugins/tool/removeunused.py @@ -28,7 +28,6 @@ # python modules # #------------------------------------------------------------------------- -from __future__ import with_statement from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext from gramps.gen.constfunc import handle2internal diff --git a/gramps/plugins/tool/reorderids.py b/gramps/plugins/tool/reorderids.py index dc01afe01..1e9144897 100644 --- a/gramps/plugins/tool/reorderids.py +++ b/gramps/plugins/tool/reorderids.py @@ -30,8 +30,6 @@ scheme specified in the database's prefix ids # standard python modules # #------------------------------------------------------------------------ -from __future__ import print_function - import re from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext diff --git a/gramps/plugins/tool/testcasegenerator.py b/gramps/plugins/tool/testcasegenerator.py index d67dc130e..674f9e0f9 100644 --- a/gramps/plugins/tool/testcasegenerator.py +++ b/gramps/plugins/tool/testcasegenerator.py @@ -24,14 +24,11 @@ """Tools/Debug/Generate Testcases for Persons and Families""" -from __future__ import unicode_literals #------------------------------------------------------------------------- # # standard python modules # #------------------------------------------------------------------------- -from __future__ import print_function - from random import randint,choice,random from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext diff --git a/gramps/plugins/tool/verify.py b/gramps/plugins/tool/verify.py index 2eee2e74c..ad078f75e 100644 --- a/gramps/plugins/tool/verify.py +++ b/gramps/plugins/tool/verify.py @@ -26,7 +26,6 @@ A plugin to verify the data against user-adjusted tests. This is the research tool, not the low-level data ingerity check. """ -from __future__ import division, print_function #------------------------------------------------------------------------ # # standard python modules diff --git a/gramps/plugins/view/pedigreeview.py b/gramps/plugins/view/pedigreeview.py index e9d6e646e..9286be499 100644 --- a/gramps/plugins/view/pedigreeview.py +++ b/gramps/plugins/view/pedigreeview.py @@ -27,8 +27,6 @@ # Python modules # #------------------------------------------------------------------------- -from __future__ import unicode_literals, division - from cgi import escape import math import sys diff --git a/gramps/plugins/view/placetreeview.py b/gramps/plugins/view/placetreeview.py index 94fa10229..8169e2e70 100644 --- a/gramps/plugins/view/placetreeview.py +++ b/gramps/plugins/view/placetreeview.py @@ -21,8 +21,6 @@ Place Tree View """ -from __future__ import unicode_literals - #------------------------------------------------------------------------- # # Gramps modules diff --git a/gramps/plugins/view/relview.py b/gramps/plugins/view/relview.py index 94b045a97..a614ed1cd 100644 --- a/gramps/plugins/view/relview.py +++ b/gramps/plugins/view/relview.py @@ -21,7 +21,6 @@ """ Relationship View """ -from __future__ import unicode_literals #------------------------------------------------------------------------- # diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py index 414a3bd80..df2df7b01 100644 --- a/gramps/plugins/webreport/narrativeweb.py +++ b/gramps/plugins/webreport/narrativeweb.py @@ -65,7 +65,6 @@ Classes for producing the web pages: #------------------------------------------------ # python modules #------------------------------------------------ -from __future__ import print_function, division from functools import partial import gc import os diff --git a/gramps/test/test/test_util_test.py b/gramps/test/test/test_util_test.py index af904f4cb..969336d46 100644 --- a/gramps/test/test/test_util_test.py +++ b/gramps/test/test/test_util_test.py @@ -21,8 +21,6 @@ # test/test/test_util_test.py """unittest (test_util_test.py) for test_util.py""" -from __future__ import print_function - import sys import os import tempfile diff --git a/gramps/webapp/client.py b/gramps/webapp/client.py index 18fbee06a..0a573079f 100644 --- a/gramps/webapp/client.py +++ b/gramps/webapp/client.py @@ -1,5 +1,3 @@ -from __future__ import print_function - import urllib2 import urllib diff --git a/gramps/webapp/grampsdb/admin.py b/gramps/webapp/grampsdb/admin.py index 3d0ec19d0..e6330bd41 100644 --- a/gramps/webapp/grampsdb/admin.py +++ b/gramps/webapp/grampsdb/admin.py @@ -20,8 +20,6 @@ # webapp/grampsdb/admin.py -from __future__ import print_function - from gramps.webapp.grampsdb.models import * from django.contrib import admin diff --git a/gramps/webapp/grampsdb/models.py b/gramps/webapp/grampsdb/models.py index 42af413f0..c302ee99a 100644 --- a/gramps/webapp/grampsdb/models.py +++ b/gramps/webapp/grampsdb/models.py @@ -24,8 +24,6 @@ This requires initial data for all of the Types, which is loaded by the fixtures/initial_data.json, which is created by init.py. """ -from __future__ import print_function - from django.db import models from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes import generic diff --git a/gramps/webapp/grampsdb/view/event.py b/gramps/webapp/grampsdb/view/event.py index d4faaf7b8..78b5c1404 100644 --- a/gramps/webapp/grampsdb/view/event.py +++ b/gramps/webapp/grampsdb/view/event.py @@ -19,8 +19,6 @@ """ Views for Person, Name, and Surname """ -from __future__ import print_function - ## Gramps Modules from gramps.webapp.utils import _, boolean, update_last_changed, build_search from gramps.webapp.grampsdb.models import Event, EventType, EventRef, EventRoleType, Person diff --git a/gramps/webapp/grampsdb/view/png.py b/gramps/webapp/grampsdb/view/png.py index 88143fa14..9cdc3f6be 100644 --- a/gramps/webapp/grampsdb/view/png.py +++ b/gramps/webapp/grampsdb/view/png.py @@ -163,8 +163,6 @@ And now, my famous members """ # http://www.python.org/doc/2.2.3/whatsnew/node5.html -from __future__ import print_function - __version__ = "$URL$ $Rev$" from array import array diff --git a/gramps/webapp/init.py b/gramps/webapp/init.py index 5b19c8c9d..61141bc85 100644 --- a/gramps/webapp/init.py +++ b/gramps/webapp/init.py @@ -23,8 +23,6 @@ architecture. We could have done this in Python, or SQL, but this makes it useful for all Django-based backends but still puts it into their syncdb API. """ -from __future__ import print_function - import time import os os.environ["DJANGO_SETTINGS_MODULE"] = "settings" diff --git a/gramps/webapp/libdjango.py b/gramps/webapp/libdjango.py index df9407dfc..9d79853ed 100644 --- a/gramps/webapp/libdjango.py +++ b/gramps/webapp/libdjango.py @@ -24,8 +24,6 @@ # Python Modules # #------------------------------------------------------------------------ -from __future__ import print_function - import time import sys if sys.version_info[0] < 3: diff --git a/gramps/webapp/reports.py b/gramps/webapp/reports.py index cfd32fffd..fbf535163 100644 --- a/gramps/webapp/reports.py +++ b/gramps/webapp/reports.py @@ -22,8 +22,6 @@ # imports for import/export: -from __future__ import print_function - from gramps.gen.dbstate import DbState from gramps.cli.grampscli import CLIManager from gramps.gen.plug import BasePluginManager diff --git a/gramps/webapp/utils.py b/gramps/webapp/utils.py index dd6d6305f..1972fca79 100644 --- a/gramps/webapp/utils.py +++ b/gramps/webapp/utils.py @@ -24,8 +24,6 @@ # Python Modules # #------------------------------------------------------------------------ -from __future__ import print_function - import sys import re import datetime