Rev 1253: Merge support for new-style classes. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

Jelmer Vernooij jelmer at samba.org
Sun Jun 22 07:36:40 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1253
revision-id: jelmer at samba.org-20080622063639-qkybtj9dm1stk5wa
parent: jelmer at samba.org-20080621210709-rige4bhwd07t32gs
parent: mnordhoff at mattnordhoff.com-20080622061937-k03f9o9iyhwewcw4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-06-22 08:36:39 +0200
message:
  Merge support for new-style classes.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  layout.py                      layout.py-20080323165407-y9qw8nx4oykvoe1k-1
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  repos.py                       repos.py-20080621160832-kvb89lus284oufuq-1
  tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
    ------------------------------------------------------------
    revno: 1244.1.4
    revision-id: mnordhoff at mattnordhoff.com-20080622061937-k03f9o9iyhwewcw4
    parent: mnordhoff at mattnordhoff.com-20080622044133-r59mxszw9a448py3
    committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
    branch nick: new-style-classes
    timestamp: Sun 2008-06-22 06:19:37 +0000
    message:
      Fix one that I missed before.
    modified:
      tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
    ------------------------------------------------------------
    revno: 1244.1.3
    revision-id: mnordhoff at mattnordhoff.com-20080622044133-r59mxszw9a448py3
    parent: mnordhoff at mattnordhoff.com-20080622044001-iwdyf5gsll53a14p
    committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
    branch nick: new-style-classes
    timestamp: Sun 2008-06-22 04:41:33 +0000
    message:
      Fix another one
    modified:
      repos.py                       repos.py-20080621160832-kvb89lus284oufuq-1
    ------------------------------------------------------------
    revno: 1244.1.2
    revision-id: mnordhoff at mattnordhoff.com-20080622044001-iwdyf5gsll53a14p
    parent: mnordhoff at mattnordhoff.com-20080620022924-gf2zewthsn4oim38
    parent: jelmer at samba.org-20080621210709-rige4bhwd07t32gs
    committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
    branch nick: new-style-classes
    timestamp: Sun 2008-06-22 04:40:01 +0000
    message:
      Merge trunk
    removed:
      delta.py                       delta.py-20080617225125-jeg43afui0czkuwk-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
    added:
      client.c                       client.pyx-20080313235339-wbyjbw2namuiql8f-1
      delta.py                       delta.py-20080316001917-xyng7m3jlxvdc4c9-1
      ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
      repos.py                       repos.py-20080621160832-kvb89lus284oufuq-1
    modified:
      Makefile                       makefile.other-20080311181537-5svhje3v1flh1n4f-1
      auth.py                        auth.py-20071209174622-w8d42k6nm5yhxvi8-1
      branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
      convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
      core.py                        core.py-20080615010310-67lnibnp889hlarb-1
      errors.py                      errors.py-20061226172623-w1sbj8ynpo0eojqp-1
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
      setup.py                       setup.py-20060502115218-86950492da22353f
      tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
      tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1244.1.1
    revision-id: mnordhoff at mattnordhoff.com-20080620022924-gf2zewthsn4oim38
    parent: jelmer at samba.org-20080619153347-eysgz8ci9hvjr5r3
    committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
    branch nick: new-style-classes
    timestamp: Fri 2008-06-20 02:29:24 +0000
    message:
      Always use new-style classes
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      layout.py                      layout.py-20080323165407-y9qw8nx4oykvoe1k-1
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
=== modified file 'fetch.py'
--- a/fetch.py	2008-06-21 16:21:46 +0000
+++ b/fetch.py	2008-06-22 04:40:01 +0000
@@ -85,7 +85,7 @@
         raise InvalidFileName(path)
 
 
-class RevisionBuildEditor:
+class RevisionBuildEditor(object):
     """Implementation of the Subversion commit editor interface that builds a 
     Bazaar revision.
     """
@@ -209,7 +209,7 @@
         self.inventory.rename(file_id, parent_id, urlutils.basename(path))
 
 
-class DirectoryBuildEditor:
+class DirectoryBuildEditor(object):
     def __init__(self, editor, old_id, new_id, parent_revids=[]):
         self.editor = editor
         self.old_id = old_id
@@ -345,7 +345,7 @@
             self.editor.inventory.remove_recursive_id(self.editor._get_old_id(self.old_id, path))
 
 
-class FileBuildEditor:
+class FileBuildEditor(object):
     def __init__(self, editor, path, file_id, file_parents=[], data="", 
                  is_symlink=False):
         self.path = path

=== modified file 'layout.py'
--- a/layout.py	2008-05-04 23:24:03 +0000
+++ b/layout.py	2008-06-20 02:29:24 +0000
@@ -15,7 +15,7 @@
 
 from bzrlib.errors import NotBranchError
 
-class RepositoryLayout:
+class RepositoryLayout(object):
     """Describes a repository layout."""
     def get_tag_path(self, name, project=""):
         """Return the path at which the tag with specified name should be found.

=== modified file 'logwalker.py'
--- a/logwalker.py	2008-06-21 20:44:24 +0000
+++ b/logwalker.py	2008-06-22 04:40:01 +0000
@@ -400,7 +400,7 @@
         finally:
             self._transport.connections.add(conn)
 
-        class DirTreeLister:
+        class DirTreeLister(object):
             def __init__(self, tree, path):
                 self.tree = tree
                 self.path = path
@@ -420,7 +420,7 @@
                 self.tree.files.append(urlutils.join(self.tree.base, path))
                 return None
 
-        class TreeLister:
+        class TreeLister(object):
             def __init__(self, base):
                 self.files = []
                 self.base = base

=== modified file 'repos.py'
--- a/repos.py	2008-06-21 16:21:46 +0000
+++ b/repos.py	2008-06-22 04:41:33 +0000
@@ -23,7 +23,7 @@
     r = svn.repos.create(path, '', '', None, None)
     return Repository(path, r)
 
-class Repository:
+class Repository(object):
     def __init__(self, local_path, _repos=None):
         if _repos is not None:
             self.repos = _repos

=== modified file 'tests/__init__.py'
--- a/tests/__init__.py	2008-06-21 20:44:24 +0000
+++ b/tests/__init__.py	2008-06-22 06:19:37 +0000
@@ -243,7 +243,7 @@
 
     def commit_editor(self, url, message="Test commit"):
         ra = RemoteAccess(url.encode('utf8'))
-        class CommitEditor:
+        class CommitEditor(object):
             def __init__(self, ra, editor, base_revnum, base_url):
                 self._used = False
                 self.ra = ra

=== modified file 'tree.py'
--- a/tree.py	2008-06-19 15:33:26 +0000
+++ b/tree.py	2008-06-20 02:29:24 +0000
@@ -118,7 +118,7 @@
         return osutils.split_lines(self.file_data[file_id])
 
 
-class TreeBuildEditor:
+class TreeBuildEditor(object):
     """Builds a tree given Subversion tree transform calls."""
     def __init__(self, tree):
         self.tree = tree
@@ -142,7 +142,7 @@
         pass
 
 
-class DirectoryTreeEditor:
+class DirectoryTreeEditor(object):
     def __init__(self, tree, file_id):
         self.tree = tree
         self.file_id = file_id
@@ -178,7 +178,7 @@
         pass
 
 
-class FileTreeEditor:
+class FileTreeEditor(object):
     def __init__(self, tree, path):
         self.tree = tree
         self.path = path




More information about the bazaar-commits mailing list