Merge remote-tracking branch 'origin/master'

weblate/models.py

+# -*- coding: utf-8 -*-
+#
+# Copyright © 2012 - 2013 Michal Čihař <michal@cihar.com>
+#
+# This file is part of Weblate <http://weblate.org/>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#

weblate/settings_test.py

@@ -32,7 +32,8 @@ if 'TRAVIS_DATABASE' in os.environ:
         DATABASES['default']['USER'] = 'root'
         DATABASES['default']['PASSWORD'] = ''
     elif os.environ['TRAVIS_DATABASE'] == 'postgresql':
-        DATABASES['default']['ENGINE'] = 'django.db.backends.postgresql_psycopg2'
+        DATABASES['default']['ENGINE'] = \
+            'django.db.backends.postgresql_psycopg2'
         DATABASES['default']['NAME'] = 'weblate'
         DATABASES['default']['USER'] = 'postgres'
         DATABASES['default']['PASSWORD'] = ''

weblate/trans/machine/base.py

@@ -23,6 +23,7 @@ Base code for machine translation services.
 
 from django.core.cache import cache
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 import json
 import urllib
 import urllib2

weblate/trans/machine/google.py

@@ -19,9 +19,8 @@
 #
 
 from weblate.trans.machine.base import (
-    MachineTranslation, MachineTranslationError
+    MachineTranslation, MachineTranslationError, ImproperlyConfigured
 )
-from django.core.exceptions import ImproperlyConfigured
 from weblate import appsettings
 
 

weblate/trans/machine/microsoft.py

@@ -20,9 +20,8 @@
 
 from datetime import datetime, timedelta
 from weblate.trans.machine.base import (
-    MachineTranslation, MachineTranslationError
+    MachineTranslation, MachineTranslationError, ImproperlyConfigured
 )
-from django.core.exceptions import ImproperlyConfigured
 from weblate import appsettings
 
 BASE_URL = 'http://api.microsofttranslator.com/V2/Ajax.svc/'

weblate/trans/machine/tmserver.py

@@ -18,8 +18,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from weblate.trans.machine.base import MachineTranslation
-from django.core.exceptions import ImproperlyConfigured
+from weblate.trans.machine.base import (
+    MachineTranslation, ImproperlyConfigured
+)
 import urllib
 
 from weblate import appsettings