From ca4ace407c938d58c7fe33cb872b0705635b39cf Mon Sep 17 00:00:00 2001 From: ben Date: Sun, 16 Jun 2002 07:12:39 +0000 Subject: Adapted everything to new exploded format git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@130 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109 --- rdiff-backup/rdiff_backup/connection.py | 40 ++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 10 deletions(-) (limited to 'rdiff-backup/rdiff_backup/connection.py') diff --git a/rdiff-backup/rdiff_backup/connection.py b/rdiff-backup/rdiff_backup/connection.py index deff577..74d413d 100644 --- a/rdiff-backup/rdiff_backup/connection.py +++ b/rdiff-backup/rdiff_backup/connection.py @@ -1,5 +1,4 @@ from __future__ import generators -execfile("rdiff.py") import types, os, tempfile, cPickle, shutil, traceback ####################################################################### @@ -38,10 +37,9 @@ class LocalConnection(Connection): self.conn_number = 0 # changed by SetConnections for server def __getattr__(self, name): - try: return globals()[name] - except KeyError: - try: return __builtins__.__dict__[name] - except KeyError: raise NameError, name + if name in globals(): return globals()[name] + elif isinstance(__builtins__, dict): return __builtins__[name] + else: return __builtins__.__dict__[name] def __setattr__(self, name, value): globals()[name] = value @@ -56,11 +54,6 @@ class LocalConnection(Connection): def quit(self): pass -Globals.local_connection = LocalConnection() -Globals.connections.append(Globals.local_connection) -# Following changed by server in SetConnections -Globals.connection_dict[0] = Globals.local_connection - class ConnectionRequest: """Simple wrapper around a PipeConnection request""" @@ -493,3 +486,30 @@ class VirtualFile: line = self.readline() if not line: break yield line + + +# everything has to be available here for remote connection's use, but +# put at bottom to reduce circularities. +import Globals, Time, Rdiff, Hardlink, FilenameMapping +from static import * +from lazy import * +from log import * +from iterfile import * +from connection import * +from rpath import * +from robust import * +from rorpiter import * +from destructive_stepping import * +from selection import * +from statistics import * +from increment import * +from restore import * +from manage import * +from highlevel import * + + +Globals.local_connection = LocalConnection() +Globals.connections.append(Globals.local_connection) +# Following changed by server in SetConnections +Globals.connection_dict[0] = Globals.local_connection + -- cgit v1.2.1