Merge lp:~xnox/apt-btrfs-snapshot/pep8 into lp:apt-btrfs-snapshot

[Dimitri John Ledkov]

[Michael Vogt (mvo)]

Looks good, thanks. I personally prefer lines 8, 43 to be in the same line but thats a tiny detail.

review: Approve

=== modified file 'apt_btrfs_snapshot.py'
--- apt_btrfs_snapshot.py	2012-07-12 11:30:15 +0000
+++ apt_btrfs_snapshot.py	2013-01-06 02:46:20 +0000
@@ -128,9 +128,10 @@
     def _get_supported_btrfs_root_fstab_entry(self):
         """ return the supported btrfs root FstabEntry or None """
         for entry in self.fstab:
-            if (entry.mountpoint == "/" and
-                entry.fstype == "btrfs" and
-                "subvol=@" in entry.options):
+            if (
+                    entry.mountpoint == "/" and
+                    entry.fstype == "btrfs" and
+                    "subvol=@" in entry.options):
                 return entry
         return None
 
@@ -213,7 +214,7 @@
         try:
             print("Available snapshots older than '%s':" % timefmt)
             print("  \n".join(self.get_btrfs_root_snapshots_list(
-                    older_than=older_than_unixtime)))
+                older_than=older_than_unixtime)))
         except AptBtrfsRootWithNoatimeError:
             sys.stderr.write("Error: fstab option 'noatime' incompatible "
                              "with option")
@@ -225,7 +226,7 @@
         older_than_unixtime = self._parse_older_than_to_unixtime(timefmt)
         try:
             for snap in self.get_btrfs_root_snapshots_list(
-                older_than=older_than_unixtime):
+                    older_than=older_than_unixtime):
                 res &= self.delete_snapshot(snap)
         except AptBtrfsRootWithNoatimeError:
             sys.stderr.write("Error: fstab option 'noatime' incompatible with "
@@ -241,9 +242,10 @@
         """ set new default """
         mp = self.mount_btrfs_root_volume()
         new_root = os.path.join(mp, snapshot_name)
-        if (os.path.isdir(new_root) and
-            snapshot_name.startswith("@") and
-            snapshot_name != "@"):
+        if (
+                os.path.isdir(new_root) and
+                snapshot_name.startswith("@") and
+                snapshot_name != "@"):
             default_root = os.path.join(mp, "@")
             backup = os.path.join(mp, self.BACKUP_PREFIX + self._get_now_str())
             os.rename(default_root, backup)

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-26 09:27:26 +0000
+++ debian/changelog	2013-01-06 02:46:20 +0000
@@ -1,3 +1,9 @@
+apt-btrfs-snapshot (0.3.4.1) raring; urgency=low
+
+  * Fix FTBFS due to newer, more strict, pep8.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Sun, 06 Jan 2013 02:41:49 +0000
+
 apt-btrfs-snapshot (0.3.4) raring; urgency=low
 
   * Build depend on python3-all.

=== modified file 'test/test_apt_btrfs_snapshot.py'
--- test/test_apt_btrfs_snapshot.py	2012-07-12 07:31:09 +0000
+++ test/test_apt_btrfs_snapshot.py	2013-01-06 02:46:20 +0000
@@ -16,7 +16,7 @@
 from apt_btrfs_snapshot import (
     AptBtrfsSnapshot,
     AptBtrfsRootWithNoatimeError,
-    )
+)
 
 
 class TestFstab(unittest.TestCase):