sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove obsolete conditional imports (#548)

Browse source 
Remove conditional imports left over from python2/3 support.
This commit is contained in:
Hugo Osvaldo Barrera 2017-02-06 17:00:29 -03:00 committed by Markus Unterwaditzer
parent 6a0b95a4bd
commit 38f5dafc1c
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vdirsyncer/cli/config.py
View file

@ -1,6 +1,7 @@
import json import json
import os import os
import string import string
from configparser import RawConfigParser
from itertools import chain from itertools import chain
from click_threading import get_ui_worker from click_threading import get_ui_worker
@ -10,10 +11,6 @@ from .utils import storage_class_from_config
from .. import PROJECT_HOME, exceptions from .. import PROJECT_HOME, exceptions
from ..utils import cached_property, expand_path from ..utils import cached_property, expand_path
try:
from ConfigParser import RawConfigParser
except ImportError:
from configparser import RawConfigParser
GENERAL_ALL = frozenset(['status_path']) GENERAL_ALL = frozenset(['status_path'])
GENERAL_REQUIRED = frozenset(['status_path']) GENERAL_REQUIRED = frozenset(['status_path'])

6
vdirsyncer/cli/utils.py
View file

@ -6,6 +6,7 @@ import importlib
import itertools import itertools
import json import json
import os import os
import queue
import sys import sys
from atomicwrites import atomic_write from atomicwrites import atomic_write
@ -19,11 +20,6 @@ from .. import BUGTRACKER_HOME, DOCS_HOME, exceptions
from ..sync import IdentConflict, PartialSync, StorageEmpty, SyncConflict from ..sync import IdentConflict, PartialSync, StorageEmpty, SyncConflict
from ..utils import expand_path, get_storage_init_args from ..utils import expand_path, get_storage_init_args
try:
import Queue as queue
except ImportError:
import queue
STATUS_PERMISSIONS = 0o600 STATUS_PERMISSIONS = 0o600
STATUS_DIR_PERMISSIONS = 0o700 STATUS_DIR_PERMISSIONS = 0o700