From 38f5dafc1c939e842bf521f9fbb388b224e63a41 Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Mon, 6 Feb 2017 17:00:29 -0300 Subject: [PATCH] Remove obsolete conditional imports (#548) Remove conditional imports left over from python2/3 support. --- vdirsyncer/cli/config.py | 5 +---- vdirsyncer/cli/utils.py | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/vdirsyncer/cli/config.py b/vdirsyncer/cli/config.py index 393335c..72f9443 100644 --- a/vdirsyncer/cli/config.py +++ b/vdirsyncer/cli/config.py @@ -1,6 +1,7 @@ import json import os import string +from configparser import RawConfigParser from itertools import chain from click_threading import get_ui_worker @@ -10,10 +11,6 @@ from .utils import storage_class_from_config from .. import PROJECT_HOME, exceptions from ..utils import cached_property, expand_path -try: - from ConfigParser import RawConfigParser -except ImportError: - from configparser import RawConfigParser GENERAL_ALL = frozenset(['status_path']) GENERAL_REQUIRED = frozenset(['status_path']) diff --git a/vdirsyncer/cli/utils.py b/vdirsyncer/cli/utils.py index 9784c40..cfca88b 100644 --- a/vdirsyncer/cli/utils.py +++ b/vdirsyncer/cli/utils.py @@ -6,6 +6,7 @@ import importlib import itertools import json import os +import queue import sys from atomicwrites import atomic_write @@ -19,11 +20,6 @@ from .. import BUGTRACKER_HOME, DOCS_HOME, exceptions from ..sync import IdentConflict, PartialSync, StorageEmpty, SyncConflict from ..utils import expand_path, get_storage_init_args -try: - import Queue as queue -except ImportError: - import queue - STATUS_PERMISSIONS = 0o600 STATUS_DIR_PERMISSIONS = 0o700