Adapted to changes in python-application

blink/__init__.py

@@ -16,8 +16,8 @@ import cjson
 from PyQt4.QtGui import QApplication
 from application import log
 from application.notification import IObserver, NotificationCenter
-from application.python.util import Null
-from application.system import host, unlink
+from application.python import Null
+from application.system import host, makedirs, unlink
 from eventlet import api
 from gnutls.crypto import X509Certificate, X509PrivateKey
 from gnutls.errors import GNUTLSError
@@ -29,7 +29,7 @@ from sipsimple.configuration.settings import SIPSimpleSettings
 from sipsimple.storage import FileStorage
 from sipsimple.threading import run_in_twisted_thread
 from sipsimple.threading.green import run_in_green_thread
-from sipsimple.util import TimestampedNotificationData, makedirs
+from sipsimple.util import TimestampedNotificationData
 
 from blink.configuration.account import AccountExtension, BonjourAccountExtension
 from blink.configuration.datatypes import InvalidToken

blink/accounts.py

@@ -20,7 +20,7 @@ from PyQt4.QtWebKit  import QWebView
 
 import cjson
 from application.notification import IObserver, NotificationCenter
-from application.python.util import Null
+from application.python import Null
 from gnutls.errors import GNUTLSError
 from zope.interface import implements
 

blink/contacts.py

@@ -19,8 +19,8 @@ from PyQt4.QtGui  import QAction, QKeyEvent, QListView, QMenu, QMouseEvent, QReg
 
 from application.notification import IObserver, NotificationCenter
 from application.python.decorator import decorator, preserve_signature
-from application.python.util import Null
-from application.system import unlink
+from application.python import Null
+from application.system import makedirs, unlink
 from collections import deque
 from eventlet import api
 from eventlet.green import httplib, urllib2
@@ -34,7 +34,6 @@ from sipsimple.account import AccountManager, BonjourAccount
 from sipsimple.configuration.settings import SIPSimpleSettings
 from sipsimple.threading import run_in_thread, run_in_twisted_thread
 from sipsimple.threading.green import run_in_green_thread
-from sipsimple.util import makedirs
 
 from blink.configuration.datatypes import AuthorizationToken, InvalidToken
 from blink.resources import ApplicationData, Resources, IconCache

blink/event.py

@@ -5,7 +5,7 @@ __all__ = ['CallFunctionEvent']
 
 from PyQt4.QtCore import QEvent
 
-from sipsimple.util import classproperty
+from application.python.descriptor import classproperty
 
 
 class EventMeta(type(QEvent)):

blink/logging.py

@@ -13,11 +13,12 @@ from pprint import pformat
 from application import log
 from application.notification import IObserver, NotificationCenter
 from application.python.queue import EventQueue
-from application.python.util import Null, Singleton
+from application.python import Null
+from application.python.types import Singleton
+from application.system import makedirs
 from zope.interface import implements
 
 from sipsimple.configuration.settings import SIPSimpleSettings
-from sipsimple.util import makedirs
 
 from blink.resources import ApplicationData
 

blink/mainwindow.py

@@ -13,7 +13,7 @@ from PyQt4.QtGui  import QAction, QActionGroup, QDesktopServices, QShortcut
 from PyQt4.QtGui  import QBrush, QColor, QFontMetrics, QIcon, QPainter, QPen, QPixmap, QStyle, QStyleOptionComboBox, QStyleOptionFrameV2
 
 from application.notification import IObserver, NotificationCenter
-from application.python.util import Null
+from application.python import Null
 from zope.interface import implements
 
 from sipsimple.account import Account, AccountManager, BonjourAccount

blink/preferences.py

@@ -14,7 +14,7 @@ from PyQt4.QtGui  import QActionGroup, QButtonGroup, QFileDialog, QListView, QLi
 
 from application import log
 from application.notification import IObserver, NotificationCenter
-from application.python.util import Null
+from application.python import Null
 from gnutls.crypto import X509Certificate, X509PrivateKey
 from gnutls.errors import GNUTLSError
 from zope.interface import implements

blink/resources.py

@@ -13,11 +13,11 @@ import sys
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui  import QPixmap
 from application import log
-from application.python.util import Singleton
-from application.system import unlink
+from application.python.descriptor import classproperty
+from application.python.types import Singleton
+from application.system import makedirs, unlink
 from collections import deque
 from hashlib import sha512
-from sipsimple.util import classproperty, makedirs
 
 
 class DirectoryContextManager(unicode):

blink/sessions.py

@@ -19,7 +19,8 @@ from PyQt4.QtCore import Qt, QAbstractListModel, QByteArray, QEvent, QMimeData,
 from PyQt4.QtGui  import QAction, QApplication, QBrush, QColor, QDrag, QLinearGradient, QListView, QMenu, QPainter, QPen, QPixmap, QShortcut, QStyle, QStyledItemDelegate
 
 from application.notification import IObserver, NotificationCenter
-from application.python.util import Null, Singleton
+from application.python import Null
+from application.python.types import Singleton
 from zope.interface import implements
 
 from sipsimple.account import Account, AccountManager, BonjourAccount

blink/update/__init__.py

@@ -5,7 +5,7 @@ __all__ = ['IUpdateManager', 'UpdateManager']
 
 import sys
 
-from application.python.util import Null
+from application.python import Null
 from zope.interface import Interface
 
 

blink/util.py

@@ -6,7 +6,7 @@ __all__ = ['QSingleton', 'call_in_gui_thread', 'call_later', 'run_in_gui_thread'
 from PyQt4.QtCore import QObject, QTimer
 from PyQt4.QtGui import QApplication
 from application.python.decorator import decorator, preserve_signature
-from application.python.util import Singleton
+from application.python.types import Singleton
 
 from blink.event import CallFunctionEvent