Skip to content

remove a circular require #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2020
Merged

remove a circular require #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/net/ldap/dataset.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require_relative 'entry'

# -*- ruby encoding: utf-8 -*-
##
# An LDAP Dataset. Used primarily as an intermediate format for converting
Expand Down Expand Up @@ -164,5 +166,3 @@ def read_ldif(io)
end
end
end

require_relative 'entry' unless defined? Net::LDAP::Entry
4 changes: 2 additions & 2 deletions lib/net/ldap/entry.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require_relative 'dataset'

# -*- ruby encoding: utf-8 -*-
##
# Objects of this class represent individual entries in an LDAP directory.
Expand Down Expand Up @@ -195,5 +197,3 @@ def setter?(sym)
end
private :setter?
end # class Entry

require_relative 'dataset' unless defined? Net::LDAP::Dataset